diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-02-26 11:45:54 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-02-26 18:12:01 -0500 |
| commit | c8ff4a92f7916cde54308ee6a3e5c564e9160620 (patch) | |
| tree | af20d695cd11c8ca2fea771240457d8bb13757ae /pkgs/games/steam/steam.nix | |
| parent | f07097902cf7355ec02341c0e6576f8d5bc0ccc6 (diff) | |
treewide: use runtimeShell instead of stdenv.shell whenever possible
Whenever we create scripts that are installed to $out, we must use runtimeShell
in order to get the shell that can be executed on the machine we create the
package for. This is relevant for cross-compiling. The only use case for
stdenv.shell are scripts that are executed as part of the build system.
Usages in checkPhase are borderline however to decrease the likelyhood
of people copying the wrong examples, I decided to use runtimeShell as well.
(cherry picked from commit dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1)
Diffstat (limited to '')
| -rw-r--r-- | pkgs/games/steam/steam.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index dd6e9a070b19..95493498f5e7 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, traceDeps ? false}: +{stdenv, fetchurl, runtimeShell, traceDeps ? false}: let traceLog = "/tmp/steam-trace-dependencies.log"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { rm $out/bin/steamdeps ${stdenv.lib.optionalString traceDeps '' cat > $out/bin/steamdeps <<EOF - #!${stdenv.shell} + #!${runtimeShell} echo \$1 >> ${traceLog} cat \$1 >> ${traceLog} echo >> ${traceLog} |