Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(software/steam): fix package handling, reformat

Browse source
This commit is contained in:
Infinidoge 2021-12-07 10:48:39 -05:00
parent 84cc6b4839
commit ad205864a4
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/modules/software/steam.nix
View file

@ -6,7 +6,7 @@ let
hw = config.modules.hardware; hw = config.modules.hardware;
steam = pkgs.steam.override { steam = cfg.package.override {
extraLibraries = (pkgs: extraLibraries = (pkgs:
(with config.hardware.opengl; (with config.hardware.opengl;
if pkgs.hostPlatform.is64bit if pkgs.hostPlatform.is64bit
@ -14,27 +14,31 @@ let
else [ package32 ] ++ extraPackages32) else [ package32 ] ++ extraPackages32)
++ (with pkgs; [ pipewire ])); ++ (with pkgs; [ pipewire ]));
extraProfile = mkIf hw.gpu.nvidia ''
unset VK_ICD_FILENAMES
export VK_ICD_FILENAMES=${config.hardware.nvidia.package}/share/vulkan/icd.d/nvidia_icd.json:${config.hardware.nvidia.package.lib32}/share/vulkan/icd.d/nvidia_icd32.json
'';
}; };
in in
{ {
options.modules.software.steam = { options.modules.software.steam = with types; {
enable = mkBoolOpt false; enable = mkBoolOpt false;
package = let pkg = pkgs.steam; in
mkOpt package
(if hw.gpu.nvidia
then
pkg.override
{
extraProfile = ''
unset VK_ICD_FILENAMES
export VK_ICD_FILENAMES=${config.hardware.nvidia.package}/share/vulkan/icd.d/nvidia_icd.json:${config.hardware.nvidia.package.lib32}/share/vulkan/icd.d/nvidia_icd32.json
'';
}
else pkg);
}; };
config = mkMerge [ config = mkMerge [
{ {
assertions = [ assertions = [{
{ assertion = if cfg.enable then config.info.graphical else true;
assertion = cfg.enable && !config.info.graphical; message = "Steam cannot be enabled in a non-graphical environment";
message = "Steam cannot be enabled in a non-graphical environment"; }];
}
];
} }
(mkIf cfg.enable { (mkIf cfg.enable {
@ -54,6 +58,7 @@ in
steam.run steam.run
pkgs.protonup pkgs.protonup
pkgs.wineWowPackages.stable
]; ];
}) })
]; ];