diff options
| author | Atemu <atemu.main@gmail.com> | 2024-03-26 12:06:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 12:06:34 +0000 |
| commit | 9622a592411831858beacbbb400bd67538de7433 (patch) | |
| tree | c533dc28c1e203abe4cd2613b11cf922a9a3bda4 /nixos | |
| parent | 060f8a03dfdfe700be89118687ccad91057d56a7 (diff) | |
| parent | 942a3815732370d7609a74600c3dbd85de49e7bc (diff) | |
Merge pull request #299036 from Shawn8901/fix-extest-extraenv
steam: fix merging of extraEnv with extest enabled
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/steam.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index c93a34f618494..bab9bf8107b6e 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -45,6 +45,8 @@ in { apply = steam: steam.override (prev: { extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) { STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeSearchPathOutput "steamcompattool" "" cfg.extraCompatPackages; + }) // (optionalAttrs cfg.extest.enable { + LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so"; }) // (prev.extraEnv or {}); extraLibraries = pkgs: let prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ]; @@ -59,8 +61,6 @@ in { # use the setuid wrapped bubblewrap bubblewrap = "${config.security.wrapperDir}/.."; }; - } // optionalAttrs cfg.extest.enable { - extraEnv.LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so"; }); description = lib.mdDoc '' The Steam package to use. Additional libraries are added from the system |