colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Pass a `bootCurl' parameter.

Browse Source 
svn path=/nixpkgs/trunk/; revision=857
This commit is contained in:
Eelco Dolstra 2004-03-27 15:50:18 +00:00
parent f1b459adfd
commit 9c4cfc02ce
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/system/stdenvs.nix
View File

@ -74,7 +74,10 @@
}; };
# 5) These packages should be pure. # 5) These packages should be pure.
stdenvLinuxBoot2Pkgs = allPackages {stdenv = stdenvLinuxBoot2;}; stdenvLinuxBoot2Pkgs = allPackages {
stdenv = stdenvLinuxBoot2;
bootCurl = stdenvLinuxBoot1Pkgs.curl;
};
# 6) So finally we can construct the Nix build environment. # 6) So finally we can construct the Nix build environment.
stdenvLinux = (import ../stdenv/nix-linux) { stdenvLinux = (import ../stdenv/nix-linux) {
@ -87,7 +90,10 @@
# 7) And we can build all packages against that, but we don't # 7) And we can build all packages against that, but we don't
# rebuild stuff from step 6. # rebuild stuff from step 6.
stdenvLinuxPkgs = stdenvLinuxPkgs =
allPackages {stdenv = stdenvLinux;} // allPackages {
stdenv = stdenvLinux;
bootCurl = stdenvLinuxBoot2Pkgs.curl;
} //
{inherit (stdenvLinuxBoot2Pkgs) {inherit (stdenvLinuxBoot2Pkgs)
gzip bzip2 bash binutils coreutils diffutils findutils gawk gcc gzip bzip2 bash binutils coreutils diffutils findutils gawk gcc
gnumake gnused gnutar gnugrep wget; gnumake gnused gnutar gnugrep wget;