lelgenio/lsfg-vk-flake
1
0
Fork 0
mirror of https://github.com/pabloaul/lsfg-vk-flake.git synced 2025-08-27 10:56:29 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: lelgenio:ec1b66adcb83276d60251b879f0f273e4eef823a
Branches Tags
lelgenio:main
lelgenio:1.0.0
lelgenio:unstable-2025-07-30-b4f2833
lelgenio:unstable-2025-07-26-3c77bad
lelgenio:unstable-2025-07-25-e8f8056
lelgenio:unstable-2025-07-24-c959c8f
lelgenio:unstable-2025-07-20-e67fcd3
lelgenio:unstable-2025-07-19-dd5190a
lelgenio:unstable-2025-07-18-53b4438
lelgenio:unstable-2025-07-14-83b869b
lelgenio:unstable-2025-07-13-f998647
lelgenio:unstable-2025-07-12-3ec418f
...
compare: lelgenio:12763fb704c4d5dc24661eb4be8d3ffde04bea2e
Branches Tags
lelgenio:main
lelgenio:1.0.0
lelgenio:unstable-2025-07-30-b4f2833
lelgenio:unstable-2025-07-26-3c77bad
lelgenio:unstable-2025-07-25-e8f8056
lelgenio:unstable-2025-07-24-c959c8f
lelgenio:unstable-2025-07-20-e67fcd3
lelgenio:unstable-2025-07-19-dd5190a
lelgenio:unstable-2025-07-18-53b4438
lelgenio:unstable-2025-07-14-83b869b
lelgenio:unstable-2025-07-13-f998647
lelgenio:unstable-2025-07-12-3ec418f

3 commits
ec1b66adcb ... 12763fb704

Author SHA1 Message Date
Nojus
12763fb704 default.nix: update lsfg-vk to e67fcd3 
spirv-headers got vendored? huh
 2025-07-21 14:15:42 +02:00
pabloaul
9a826097ad
Merge pull request #10 from adisbladis/module-no-warn 
module.nix: Don't warn when declaring option
 2025-07-21 14:08:36 +02:00
adisbladis
c88ac624f0 module.nix: Don't warn when declaring option 
The option is _always_ evaluated and therefore the warning is always output, even if your configuration is unaffected.

This refactors the module to:
- Only create env vars if their config is actually declared
- Stick the warning in the config declaration instead of the option
 2025-07-21 16:00:26 +12:00
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
default.nix
View file

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

32
module.nix
View file

@ -19,9 +19,7 @@ in
default = lsfg-vk;
};
losslessDLLFile =
lib.warn "losslessDLLFile is deprecated and will only be used by lsfg-vk if LSFG_LEGACY is set."
lib.mkOption
losslessDLLFile = lib.mkOption
{
type = with lib.types; nullOr str;
default = null;
@ -45,15 +43,23 @@ in
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
config = lib.mkIf cfg.enable (
lib.mkMerge [
{
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";
environment.sessionVariables.LSFG_DLL_PATH = lib.mkIf (cfg.losslessDLLFile != null) cfg.losslessDLLFile;
environment.sessionVariables.LSFG_CONFIG = lib.mkIf (cfg.configFile != null) 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";
}
(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;
})
]
);
}