diff --git a/flake.lock b/flake.lock index 8a9da88..3b37958 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { diff --git a/lsfg-vk-ui.nix b/lsfg-vk-ui.nix index 700eb7a..fe2f972 100644 --- a/lsfg-vk-ui.nix +++ b/lsfg-vk-ui.nix @@ -7,21 +7,21 @@ pango, gdk-pixbuf, gtk4, - libadwaita, + libadwaita }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "lsfg-vk-ui"; - version = "1.0.0"; + version = "unstable-2025-07-25-e8f8056"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - tag = "v${version}"; - hash = "sha256-nIyVOil/gHC+5a+sH3vMlcqVhixjJaGWqXbyoh2Nqyw="; + rev = "e8f805632307ab526a989b33dcf9653c5679d374"; + hash = "sha256-3EmH8skhpa0ELYE3UoV2SanGUqjC9nu8IPE3JPny+V4="; }; - - cargoHash = "sha256-hIQRS/egIDU5Vu/1KWHtpt4S26h+9GadVr+lBAG2LDg="; + + cargoHash = "sha256-EMVDcThepj8Lq42NBxROPUin94TikUdwR/wTVXn2tI0="; sourceRoot = "source/ui"; @@ -37,18 +37,11 @@ rustPlatform.buildRustPackage rec { libadwaita ]; - 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"; + meta = with lib; { + description = "Graphical interface for lsfg-vk"; homepage = "https://github.com/PancakeTAS/lsfg-vk/"; - changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ pabloaul ]; + license = licenses.mit; + platforms = platforms.linux; mainProgram = "lsfg-vk-ui"; }; } \ No newline at end of file diff --git a/lsfg-vk.nix b/lsfg-vk.nix index 63e494c..48a632a 100644 --- a/lsfg-vk.nix +++ b/lsfg-vk.nix @@ -6,23 +6,27 @@ llvmPackages, }: -llvmPackages.stdenv.mkDerivation rec { +llvmPackages.stdenv.mkDerivation { pname = "lsfg-vk"; - version = "1.0.0"; + version = "unstable-2025-07-25-e8f8056"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - tag = "v${version}"; - hash = "sha256-hWpuPH7mKbeMaLaRUwtlkNLy4lOnJEe+yd54L7y2kV0="; + rev = "e8f805632307ab526a989b33dcf9653c5679d374"; + hash = "sha256-3EmH8skhpa0ELYE3UoV2SanGUqjC9nu8IPE3JPny+V4="; fetchSubmodules = true; }; postPatch = '' substituteInPlace VkLayer_LS_frame_generation.json \ - --replace-fail "liblsfg-vk.so" "$out/lib/liblsfg-vk.so" + --replace "liblsfg-vk.so" "$out/lib/liblsfg-vk.so" ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + nativeBuildInputs = [ llvmPackages.clang-tools llvmPackages.libllvm @@ -33,12 +37,10 @@ llvmPackages.stdenv.mkDerivation rec { vulkan-headers ]; - meta = { + meta = with lib; { description = "Vulkan layer for frame generation (Requires owning Lossless Scaling)"; homepage = "https://github.com/PancakeTAS/lsfg-vk/"; - changelog = "https://github.com/PancakeTAS/lsfg-vk/releases/tag/${src.tag}"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ pabloaul ]; + license = licenses.mit; + platforms = platforms.linux; }; -} \ No newline at end of file +}