diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-08-09 15:05:30 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-08-09 15:05:30 +0000 |
| commit | bf1e734f85115778ada8188094cc2581a6f221d5 (patch) | |
| tree | 53957afbdf7ee75bc623554fd8ea3a45e28231c4 /pkgs/stdenv | |
| parent | d9ec01e77f5f344581c62ad5d26374879fc9252f (diff) | |
| download | nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.gz nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.bz2 nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.lz nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.xz nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.tar.zst nixlib-bf1e734f85115778ada8188094cc2581a6f221d5.zip | |
* Don't use the subpath operator (~) anymore, it's subsumed by normal
concatenation (+). svn path=/nixpkgs/trunk/; revision=6080
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 9e4a1b4d4d33..d6c9b80f25e6 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -210,10 +210,10 @@ rec { inherit (stdenvLinuxBoot2Pkgs) binutils; glibc = stdenvLinuxGlibc; gcc = stdenvLinuxBoot2Pkgs.gcc.gcc; - shell = stdenvLinuxBoot3Pkgs.bash ~ /bin/sh; + shell = stdenvLinuxBoot3Pkgs.bash + /bin/sh; }; - shell = stdenvLinuxBoot3Pkgs.bash ~ /bin/sh; + shell = stdenvLinuxBoot3Pkgs.bash + /bin/sh; extraAttrs = { curl = stdenvLinuxBoot3Pkgs.realCurl; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 9c2de92f18f0..401ce2417b8f 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -17,10 +17,10 @@ import ../generic { else pkgs.binutils; gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc; - shell = pkgs.bash ~ /bin/sh; + shell = pkgs.bash + /bin/sh; }; - shell = pkgs.bash ~ /bin/sh; + shell = pkgs.bash + /bin/sh; extraAttrs = { curl = pkgs.realCurl; |