Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Don't use the subpath operator (~) anymore, it's subsumed by normal

Browse Source 
concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
This commit is contained in:
Eelco Dolstra
2006-08-09 15:05:30 +00:00
parent d9ec01e77f
commit bf1e734f85
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/linux/default.nix
View File

@@ -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;

4
pkgs/stdenv/nix/default.nix
View File

@@ -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;