aboutsummaryrefslogtreecommitdiff
path: root/doc/functions
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2019-02-26 11:45:54 +0000
committerJörg Thalheim <joerg@thalheim.io>2019-02-26 14:10:49 +0000
commitdadc7eb3297e6c2fb0c0e01149c8fcebd80770c1 (patch)
tree9717b203342cd121abcdfde5ba8b66235c3ad67c /doc/functions
parent1233c8d9e9bc463899ed6a8cf0232e6bf36475ee (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.
Diffstat (limited to 'doc/functions')
-rw-r--r--doc/functions/dockertools.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
index ff446cbfffdd..2c8eb2cb7743 100644
--- a/doc/functions/dockertools.xml
+++ b/doc/functions/dockertools.xml
@@ -47,7 +47,7 @@ buildImage {
contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
- #!${stdenv.shell}
+ #!${pkgs.runtimeShell}
mkdir -p /data
'';
@@ -544,7 +544,7 @@ buildImage {
name = "shadow-basic";
runAsRoot = ''
- #!${stdenv.shell}
+ #!${pkgs.runtimeShell}
${shadowSetup}
groupadd -r redis
useradd -r -g redis redis