diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-02-26 11:45:54 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-02-26 14:10:49 +0000 |
| commit | dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1 (patch) | |
| tree | 9717b203342cd121abcdfde5ba8b66235c3ad67c /pkgs/development/pharo/vm | |
| parent | 1233c8d9e9bc463899ed6a8cf0232e6bf36475ee (diff) | |
| download | nixpkgs-dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1.tar nixpkgs-dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1.tar.gz nixpkgs-dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1.tar.bz2 nixpkgs-dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1.tar.lz nixpkgs-dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1.tar.xz nixpkgs-dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1.tar.zst nixpkgs-dadc7eb3297e6c2fb0c0e01149c8fcebd80770c1.zip | |
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 'pkgs/development/pharo/vm')
| -rw-r--r-- | pkgs/development/pharo/vm/build-vm.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/pharo/vm/vms.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 76e52692383..47773c20954 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -13,6 +13,7 @@ , libuuid , autoreconfHook , gcc48 +, runtimeShell , ... }: { name, src, version, source-date, source-url, ... }: @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { # Create the script cat > "$out/bin/${cmd}" <<EOF - #!${stdenv.shell} + #!${runtimeShell} set -f LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@" EOF diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 19065f972a4..0e65a9b990e 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -17,6 +17,7 @@ , gcc48 , fetchFromGitHub , makeWrapper +, runtimeShell } @args: let @@ -62,4 +63,3 @@ rec { }; } - |