diff --git a/lsfg-vk-ui.nix b/lsfg-vk-ui.nix index d12f832..700eb7a 100644 --- a/lsfg-vk-ui.nix +++ b/lsfg-vk-ui.nix @@ -7,17 +7,17 @@ pango, gdk-pixbuf, gtk4, - libadwaita + libadwaita, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "lsfg-vk-ui"; version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; + tag = "v${version}"; hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw="; }; @@ -37,11 +37,18 @@ rustPlatform.buildRustPackage { libadwaita ]; - meta = with lib; { - description = "Graphical interface for lsfg-vk"; + postInstall = '' + 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/"; - license = licenses.mit; - platforms = platforms.linux; + changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pabloaul ]; mainProgram = "lsfg-vk-ui"; }; } \ No newline at end of file diff --git a/lsfg-vk.nix b/lsfg-vk.nix index 3c9de0b..63e494c 100644 --- a/lsfg-vk.nix +++ b/lsfg-vk.nix @@ -6,27 +6,23 @@ llvmPackages, }: -llvmPackages.stdenv.mkDerivation { +llvmPackages.stdenv.mkDerivation rec { pname = "lsfg-vk"; version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "7113d7d02da9fc9df5cb3b03230d1f7de86f7056"; + tag = "v${version}"; hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; fetchSubmodules = true; }; postPatch = '' 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 = [ llvmPackages.clang-tools llvmPackages.libllvm @@ -37,10 +33,12 @@ llvmPackages.stdenv.mkDerivation { vulkan-headers ]; - meta = with lib; { + meta = { description = "Vulkan layer for frame generation (Requires owning Lossless Scaling)"; homepage = "https://github.com/PancakeTAS/lsfg-vk/"; - license = licenses.mit; - platforms = platforms.linux; + changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pabloaul ]; }; -} +} \ No newline at end of file