lsfg-vk(-ui): sync up with nixpkgs pr

This commit is contained in:
Nojus 2025-07-31 07:04:52 +02:00
parent cdcec1d2be
commit 081cd66b13
2 changed files with 23 additions and 18 deletions

View file

@ -7,17 +7,17 @@
pango, pango,
gdk-pixbuf, gdk-pixbuf,
gtk4, gtk4,
libadwaita libadwaita,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage rec {
pname = "lsfg-vk-ui"; pname = "lsfg-vk-ui";
version = "1.0.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PancakeTAS"; owner = "PancakeTAS";
repo = "lsfg-vk"; repo = "lsfg-vk";
rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; tag = "v${version}";
hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw="; hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw=";
}; };
@ -37,11 +37,18 @@ rustPlatform.buildRustPackage {
libadwaita libadwaita
]; ];
meta = with lib; { postInstall = ''
description = "Graphical interface for lsfg-vk"; install -Dm444 $src/ui/rsc/gay.pancake.lsfg-vk-ui.desktop $out/share/applications/gay.pancake.lsfg-vk-ui.desktop
install -Dm444 $src/ui/rsc/icon.png $out/share/icons/hicolor/256x256/apps/gay.pancake.lsfg-vk-ui.png
'';
meta = {
description = "Graphical configuration interface for lsfg-vk";
homepage = "https://github.com/PancakeTAS/lsfg-vk/"; homepage = "https://github.com/PancakeTAS/lsfg-vk/";
license = licenses.mit; changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}";
platforms = platforms.linux; license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ pabloaul ];
mainProgram = "lsfg-vk-ui"; mainProgram = "lsfg-vk-ui";
}; };
} }

View file

@ -6,27 +6,23 @@
llvmPackages, llvmPackages,
}: }:
llvmPackages.stdenv.mkDerivation { llvmPackages.stdenv.mkDerivation rec {
pname = "lsfg-vk"; pname = "lsfg-vk";
version = "1.0.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PancakeTAS"; owner = "PancakeTAS";
repo = "lsfg-vk"; repo = "lsfg-vk";
rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; tag = "v${version}";
hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postPatch = '' postPatch = ''
substituteInPlace VkLayer_LS_frame_generation.json \ substituteInPlace VkLayer_LS_frame_generation.json \
--replace "liblsfg-vk.so" "$out/lib/liblsfg-vk.so" --replace-fail "liblsfg-vk.so" "$out/lib/liblsfg-vk.so"
''; '';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
];
nativeBuildInputs = [ nativeBuildInputs = [
llvmPackages.clang-tools llvmPackages.clang-tools
llvmPackages.libllvm llvmPackages.libllvm
@ -37,10 +33,12 @@ llvmPackages.stdenv.mkDerivation {
vulkan-headers vulkan-headers
]; ];
meta = with lib; { meta = {
description = "Vulkan layer for frame generation (Requires owning Lossless Scaling)"; description = "Vulkan layer for frame generation (Requires owning Lossless Scaling)";
homepage = "https://github.com/PancakeTAS/lsfg-vk/"; homepage = "https://github.com/PancakeTAS/lsfg-vk/";
license = licenses.mit; changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}";
platforms = platforms.linux; license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ pabloaul ];
}; };
} }