diff --git a/flake.lock b/flake.lock index 3b37958..8a9da88 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1752687322, - "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { diff --git a/lsfg-vk-ui.nix b/lsfg-vk-ui.nix index 23615fa..700eb7a 100644 --- a/lsfg-vk-ui.nix +++ b/lsfg-vk-ui.nix @@ -7,21 +7,21 @@ pango, gdk-pixbuf, gtk4, - libadwaita + libadwaita, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "lsfg-vk-ui"; - version = "0.9.0-2025-07-26-3c77bad"; + version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "3c77bad7941e2699a797b2741b64b8d907118bb6"; - hash = "sha256-ZAtTzdSx81NK2ABSEIDOeYUgJDH4ROMApDSlg8U140k="; + tag = "v${version}"; + hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw="; }; - - cargoHash = "sha256-1/3CTCXTqSfb/xtx/Q1whaHPeQ0fxu0Zg2sVJPxdcK0="; + + cargoHash = "sha256-hIQRS/egIDU5Vu/1KWHtpt4S26h+9GadVr+lBAG2LDg="; sourceRoot = "source/ui"; @@ -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 88d6468..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 = "0.9.0-2025-07-26-3c77bad"; + version = "1.0.0"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "3c77bad7941e2699a797b2741b64b8d907118bb6"; - hash = "sha256-ZAtTzdSx81NK2ABSEIDOeYUgJDH4ROMApDSlg8U140k="; + 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