diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-03-04 14:51:43 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2022-03-14 08:15:45 -0700 |
| commit | 198f6c583e3c1645177072e3aa35dccb4d419130 (patch) | |
| tree | 4a7e5d411daeefd29a1670cedfb61f36b50d22e8 /pkgs/games | |
| parent | a0bbd640b8b637e29b04cef0f1ea60f1650e1e75 (diff) | |
| download | nixpkgs-198f6c583e3c1645177072e3aa35dccb4d419130.tar nixpkgs-198f6c583e3c1645177072e3aa35dccb4d419130.tar.gz nixpkgs-198f6c583e3c1645177072e3aa35dccb4d419130.tar.bz2 nixpkgs-198f6c583e3c1645177072e3aa35dccb4d419130.tar.lz nixpkgs-198f6c583e3c1645177072e3aa35dccb4d419130.tar.xz nixpkgs-198f6c583e3c1645177072e3aa35dccb4d419130.tar.zst nixpkgs-198f6c583e3c1645177072e3aa35dccb4d419130.zip | |
steam: re-expose LD_LIBRARY_PATH
Was incorrectly altered after cherry-pick
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/steam/fhsenv.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index cd2046b2383..37ec8ef8c7e 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -49,6 +49,7 @@ let # Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present exportLDPath = '' export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH + export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; # bootstrap.tar.xz has 444 permissions, which means that simple deletes fail @@ -252,7 +253,7 @@ in buildFHSUserEnv rec { fi fi - export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ${exportLDPath} ${fixBootstrap} exec steam "$@" ''; @@ -284,7 +285,8 @@ in buildFHSUserEnv rec { exit 1 fi shift - export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + + ${exportLDPath} ${fixBootstrap} exec -- "$run" "$@" ''; |