diff --git a/default.nix b/default.nix index 124b747..07fa9d5 100644 --- a/default.nix +++ b/default.nix @@ -6,6 +6,7 @@ vulkan-headers, vulkan-loader, llvmPackages, + spirv-headers, libX11, libXrandr, libXinerama, @@ -20,13 +21,13 @@ llvmPackages.stdenv.mkDerivation { pname = "lsfg-vk"; - version = "unstable-2025-07-20-e67fcd3"; + version = "unstable-2025-07-19-dd5190a"; src = fetchFromGitHub { owner = "PancakeTAS"; repo = "lsfg-vk"; - rev = "e67fcd3dd832c9d177ad2be780e5dd0e47810bdf"; - hash = "sha256-c0anP3lWJ2GcjJNGIHcY/sS86AS1tFk0t7vXbaEGTQg="; + rev = "dd5190aa680a7543143e724a100bd5d6e9898dd7"; + hash = "sha256-2WrUtjUG8l3tSElDYfhvi4lrFUG1Oh5M7DAEX2mFh5s="; fetchSubmodules = true; }; @@ -48,6 +49,7 @@ llvmPackages.stdenv.mkDerivation { buildInputs = [ vulkan-headers vulkan-loader + spirv-headers libX11 libXrandr libXinerama diff --git a/module.nix b/module.nix index 19bc424..92ab300 100644 --- a/module.nix +++ b/module.nix @@ -19,7 +19,9 @@ in default = lsfg-vk; }; - losslessDLLFile = lib.mkOption + losslessDLLFile = + lib.warn "losslessDLLFile is deprecated and will only be used by lsfg-vk if LSFG_LEGACY is set." + lib.mkOption { type = with lib.types; nullOr str; default = null; @@ -43,23 +45,15 @@ in }; }; - config = lib.mkIf cfg.enable ( - lib.mkMerge [ - { - environment.systemPackages = [ cfg.package ]; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; - # Installs the Vulkan implicit layer system-wide - environment.etc."vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json".source = - "${cfg.package}/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json"; - } - (lib.mkIf (cfg.losslessDLLFile != null) { - environment.sessionVariables.LSFG_DLL_PATH = - lib.warn "losslessDLLFile is deprecated and will only be used by lsfg-vk if LSFG_LEGACY is set." - cfg.losslessDLLFile; - }) - (lib.mkIf (cfg.configFile != null) { - environment.sessionVariables.LSFG_CONFIG = cfg.configFile; - }) - ] - ); + # Installs the Vulkan implicit layer system-wide + environment.etc."vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json".source = + "${cfg.package}/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json"; + + environment.sessionVariables.LSFG_DLL_PATH = lib.mkIf (cfg.losslessDLLFile != null) cfg.losslessDLLFile; + + environment.sessionVariables.LSFG_CONFIG = lib.mkIf (cfg.configFile != null) cfg.configFile; + }; }