Compare commits

..

No commits in common. "12763fb704c4d5dc24661eb4be8d3ffde04bea2e" and "ec1b66adcb83276d60251b879f0f273e4eef823a" have entirely different histories.

2 changed files with 18 additions and 22 deletions

View file

@ -6,6 +6,7 @@
vulkan-headers, vulkan-headers,
vulkan-loader, vulkan-loader,
llvmPackages, llvmPackages,
spirv-headers,
libX11, libX11,
libXrandr, libXrandr,
libXinerama, libXinerama,
@ -20,13 +21,13 @@
llvmPackages.stdenv.mkDerivation { llvmPackages.stdenv.mkDerivation {
pname = "lsfg-vk"; pname = "lsfg-vk";
version = "unstable-2025-07-20-e67fcd3"; version = "unstable-2025-07-19-dd5190a";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PancakeTAS"; owner = "PancakeTAS";
repo = "lsfg-vk"; repo = "lsfg-vk";
rev = "e67fcd3dd832c9d177ad2be780e5dd0e47810bdf"; rev = "dd5190aa680a7543143e724a100bd5d6e9898dd7";
hash = "sha256-c0anP3lWJ2GcjJNGIHcY/sS86AS1tFk0t7vXbaEGTQg="; hash = "sha256-2WrUtjUG8l3tSElDYfhvi4lrFUG1Oh5M7DAEX2mFh5s=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -48,6 +49,7 @@ llvmPackages.stdenv.mkDerivation {
buildInputs = [ buildInputs = [
vulkan-headers vulkan-headers
vulkan-loader vulkan-loader
spirv-headers
libX11 libX11
libXrandr libXrandr
libXinerama libXinerama

View file

@ -19,7 +19,9 @@ in
default = lsfg-vk; 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; type = with lib.types; nullOr str;
default = null; default = null;
@ -43,23 +45,15 @@ in
}; };
}; };
config = lib.mkIf cfg.enable ( config = lib.mkIf cfg.enable {
lib.mkMerge [ environment.systemPackages = [ cfg.package ];
{
environment.systemPackages = [ cfg.package ];
# Installs the Vulkan implicit layer system-wide # Installs the Vulkan implicit layer system-wide
environment.etc."vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json".source = environment.etc."vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json".source =
"${cfg.package}/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json"; "${cfg.package}/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json";
}
(lib.mkIf (cfg.losslessDLLFile != null) { environment.sessionVariables.LSFG_DLL_PATH = lib.mkIf (cfg.losslessDLLFile != null) cfg.losslessDLLFile;
environment.sessionVariables.LSFG_DLL_PATH =
lib.warn "losslessDLLFile is deprecated and will only be used by lsfg-vk if LSFG_LEGACY is set." environment.sessionVariables.LSFG_CONFIG = lib.mkIf (cfg.configFile != null) cfg.configFile;
cfg.losslessDLLFile; };
})
(lib.mkIf (cfg.configFile != null) {
environment.sessionVariables.LSFG_CONFIG = cfg.configFile;
})
]
);
} }