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

* Override packages in stdenvLinux with those already built in earlier

Browse Source 
stages of the bootstrap process (i.e., stdenvLinuxBoot).
* Add those packages to the distribution.  We didn't do that before
  because it would cause them to be built twice.

svn path=/nixpkgs/trunk/; revision=753
This commit is contained in:
Eelco Dolstra 2004-02-04 17:25:51 +00:00
parent 103d1b2c83
commit ecbf66674f
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/system/all-packages.nix
View File

@ -11,6 +11,7 @@
{system}: let { {system}: let {
allPackages = import ./all-packages-generic.nix; allPackages = import ./all-packages-generic.nix;
# The native (i.e., impure) build environment. This one uses the # The native (i.e., impure) build environment. This one uses the
# tools installed on the system outside of the Nix environment, # tools installed on the system outside of the Nix environment,
# i.e., the stuff in /bin, /usr/bin, etc. This environment should # i.e., the stuff in /bin, /usr/bin, etc. This environment should
@ -19,6 +20,7 @@
stdenvNative = (import ../stdenv/native) {system = system;}; stdenvNative = (import ../stdenv/native) {system = system;};
stdenvNativePkgs = allPackages {system = system; stdenv = stdenvNative;}; stdenvNativePkgs = allPackages {system = system; stdenv = stdenvNative;};
# The Nix build environment. # The Nix build environment.
stdenvNix = (import ../stdenv/nix) { stdenvNix = (import ../stdenv/nix) {
bootStdenv = stdenvNative; bootStdenv = stdenvNative;
@ -26,6 +28,7 @@
}; };
stdenvNixPkgs = allPackages {system = system; stdenv = stdenvNix;}; stdenvNixPkgs = allPackages {system = system; stdenv = stdenvNix;};
# The Linux build environment consists of the Nix build environment # The Linux build environment consists of the Nix build environment
# built against the GNU C Library. # built against the GNU C Library.
stdenvLinuxGlibc = stdenvNativePkgs.glibc; stdenvLinuxGlibc = stdenvNativePkgs.glibc;
@ -40,7 +43,14 @@
pkgs = stdenvLinuxBootPkgs; pkgs = stdenvLinuxBootPkgs;
glibc = stdenvLinuxGlibc; glibc = stdenvLinuxGlibc;
}; };
stdenvLinuxPkgs = allPackages {system = system; stdenv = stdenvLinux;}; stdenvLinuxPkgs =
allPackages {system = system; stdenv = stdenvLinux;} //
{inherit (stdenvLinuxBootPkgs)
gzip bzip2 bash binutils coreutils diffutils findutils gawk gcc
gnumake gnused gnutar gnugrep wget;
} //
{glibc = stdenvLinuxGlibc;};
# Select the right instantiation. # Select the right instantiation.
body = body =

25
pkgs/system/populate-cache.nix
View File

@ -1,14 +1,31 @@
let { let {
pkgs = import ./i686-linux.nix; pkgs = import ./i686-linux.nix;
body = body =
[ pkgs.zip [ pkgs.coreutils
pkgs.findutils
pkgs.diffutils
pkgs.gnused
pkgs.gnugrep
pkgs.gawk
pkgs.gnutar
pkgs.zip
pkgs.unzip pkgs.unzip
pkgs.valgrind pkgs.gzip
pkgs.bisonnew pkgs.bzip2
pkgs.flexnew pkgs.wget
pkgs.par2cmdline pkgs.par2cmdline
pkgs.cksfv pkgs.cksfv
pkgs.graphviz pkgs.graphviz
pkgs.bash
pkgs.binutils
pkgs.gnum4
pkgs.valgrind
pkgs.gnumake
pkgs.bisonnew
pkgs.flexnew
pkgs.gcc
pkgs.perl
pkgs.python
pkgs.strategoxt093 pkgs.strategoxt093
pkgs.libxml2 pkgs.libxml2
pkgs.libxslt pkgs.libxslt