mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #299036 from Shawn8901/fix-extest-extraenv
steam: fix merging of extraEnv with extest enabled
This commit is contained in:
commit
9622a59241
|
@ -45,6 +45,8 @@ in {
|
||||||
apply = steam: steam.override (prev: {
|
apply = steam: steam.override (prev: {
|
||||||
extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
|
extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
|
||||||
STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeSearchPathOutput "steamcompattool" "" 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 {});
|
}) // (prev.extraEnv or {});
|
||||||
extraLibraries = pkgs: let
|
extraLibraries = pkgs: let
|
||||||
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
|
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
|
||||||
|
@ -59,8 +61,6 @@ in {
|
||||||
# use the setuid wrapped bubblewrap
|
# use the setuid wrapped bubblewrap
|
||||||
bubblewrap = "${config.security.wrapperDir}/..";
|
bubblewrap = "${config.security.wrapperDir}/..";
|
||||||
};
|
};
|
||||||
} // optionalAttrs cfg.extest.enable {
|
|
||||||
extraEnv.LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
|
|
||||||
});
|
});
|
||||||
description = lib.mdDoc ''
|
description = lib.mdDoc ''
|
||||||
The Steam package to use. Additional libraries are added from the system
|
The Steam package to use. Additional libraries are added from the system
|
||||||
|
|
Loading…
Reference in a new issue