diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-11-14 22:11:54 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-11-14 22:27:09 +0100 |
| commit | 4c196511081948f3be4433cfc55e500cf08f8b8b (patch) | |
| tree | 7d264fb22c621d69864c6ac2f422439d5dcfdae0 /pkgs/applications/science | |
| parent | 770e83ebf9bfcc2ee3d02c1faa9a8d8d937e5460 (diff) | |
| parent | 9434ec54414c6cbfd3be6e6f8d3b7fec74e75aae (diff) | |
| download | nixlib-4c196511081948f3be4433cfc55e500cf08f8b8b.tar nixlib-4c196511081948f3be4433cfc55e500cf08f8b8b.tar.gz nixlib-4c196511081948f3be4433cfc55e500cf08f8b8b.tar.bz2 nixlib-4c196511081948f3be4433cfc55e500cf08f8b8b.tar.lz nixlib-4c196511081948f3be4433cfc55e500cf08f8b8b.tar.xz nixlib-4c196511081948f3be4433cfc55e500cf08f8b8b.tar.zst nixlib-4c196511081948f3be4433cfc55e500cf08f8b8b.zip | |
Merge #20264: root: fix environment setup
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/thisroot.patch | 15 |
3 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 45d7686b3e52..d1106a758473 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; }) ./sw_vers.patch + + # this prevents thisroot.sh from setting $p, which interferes with stdenv setup + ./thisroot.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh index 197dc78c3c2c..fc2b697d8a82 100644 --- a/pkgs/applications/science/misc/root/setup-hook.sh +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -6,4 +6,4 @@ thisroot () { source @out@/bin/thisroot.sh } -envHooks+=(thisroot) +postHooks+=(thisroot) diff --git a/pkgs/applications/science/misc/root/thisroot.patch b/pkgs/applications/science/misc/root/thisroot.patch new file mode 100644 index 000000000000..57cd5838e64a --- /dev/null +++ b/pkgs/applications/science/misc/root/thisroot.patch @@ -0,0 +1,15 @@ +diff --git a/config/thisroot.sh b/config/thisroot.sh +index 85dee20..532cb28 100644 +--- a/config/thisroot.sh ++++ b/config/thisroot.sh +@@ -15,8 +15,8 @@ drop_from_path() + return 1 + fi + +- p=$1 +- drop=$2 ++ local p=$1 ++ local drop=$2 + + newpath=`echo $p | sed -e "s;:${drop}:;:;g" \ + -e "s;:${drop};;g" \ |