mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
steam: re-expose LD_LIBRARY_PATH
Was incorrectly altered after cherry-pick
This commit is contained in:
parent
a0bbd640b8
commit
198f6c583e
@ -49,6 +49,7 @@ let
|
|||||||
# Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present
|
# Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present
|
||||||
exportLDPath = ''
|
exportLDPath = ''
|
||||||
export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
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
|
# bootstrap.tar.xz has 444 permissions, which means that simple deletes fail
|
||||||
@ -252,7 +253,7 @@ in buildFHSUserEnv rec {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
${exportLDPath}
|
||||||
${fixBootstrap}
|
${fixBootstrap}
|
||||||
exec steam "$@"
|
exec steam "$@"
|
||||||
'';
|
'';
|
||||||
@ -284,7 +285,8 @@ in buildFHSUserEnv rec {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
shift
|
shift
|
||||||
export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
|
||||||
|
${exportLDPath}
|
||||||
${fixBootstrap}
|
${fixBootstrap}
|
||||||
exec -- "$run" "$@"
|
exec -- "$run" "$@"
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user