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

* When calling all-packages.nix, pass system explicitly and don't rely

Browse Source 
on __currentSystem being "i686-linux", because we might not be on
  "i686-linux".

svn path=/nixpkgs/trunk/; revision=6218
This commit is contained in:
Eelco Dolstra 2006-08-23 16:18:02 +00:00
parent 3f49e29b0a
commit a177a9ac7c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,9 @@
rec { rec {
system = "i686-linux";
# The bootstrap process proceeds in several steps. # The bootstrap process proceeds in several steps.
# 1) Create a standard environment by downloading pre-built # 1) Create a standard environment by downloading pre-built
@ -22,16 +25,15 @@ rec {
bunzip2 = ./tools/bunzip2; bunzip2 = ./tools/bunzip2;
cp = ./tools/cp; cp = ./tools/cp;
curl = ./tools/curl-7.15.1-static.tar.bz2; curl = ./tools/curl-7.15.1-static.tar.bz2;
system = "i686-linux"; inherit system;
args = [ ./scripts/unpack-curl.sh ]; args = [ ./scripts/unpack-curl.sh ];
}; };
# This function downloads a file. # This function downloads a file.
download = {url, md5, pkgname}: derivation { download = {url, md5, pkgname}: derivation {
name = baseNameOf (toString url); name = baseNameOf (toString url);
system = "i686-linux";
builder = ./tools/bash; builder = ./tools/bash;
inherit curl url; inherit system curl url;
args = [ ./scripts/download.sh ]; args = [ ./scripts/download.sh ];
# Nix 0.8 fixed-output derivations. # Nix 0.8 fixed-output derivations.
@ -49,14 +51,13 @@ rec {
, extra3 ? null, extra4? null, patchelf ? null}: , extra3 ? null, extra4? null, patchelf ? null}:
derivation { derivation {
name = pkgname; name = pkgname;
system = "i686-linux";
builder = ./tools/bash; builder = ./tools/bash;
tar = ./tools/tar; tar = ./tools/tar;
bunzip2 = ./tools/bunzip2; bunzip2 = ./tools/bunzip2;
cp = ./tools/cp; cp = ./tools/cp;
args = [ ./scripts/unpack.sh ]; args = [ ./scripts/unpack.sh ];
tarball = download {inherit url md5 pkgname;}; tarball = download {inherit url md5 pkgname;};
inherit postProcess addToPath extra extra2 extra3 extra4 patchelf; inherit system postProcess addToPath extra extra2 extra3 extra4 patchelf;
}; };
# The various statically linked components that make up the standard # The various statically linked components that make up the standard
@ -107,10 +108,9 @@ rec {
stdenvInitial = let { stdenvInitial = let {
body = derivation { body = derivation {
name = "stdenv-linux-initial"; name = "stdenv-linux-initial";
system = "i686-linux";
builder = ./tools/bash; builder = ./tools/bash;
args = ./scripts/builder-stdenv-initial.sh; args = ./scripts/builder-stdenv-initial.sh;
inherit staticTools; inherit system staticTools;
} // { } // {
mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // { mkDerivation = attrs: derivation ((removeAttrs attrs ["meta"]) // {
builder = ./tools/bash; builder = ./tools/bash;
@ -154,6 +154,7 @@ rec {
# 2) These are the packages that we can build with the first # 2) These are the packages that we can build with the first
# stdenv. We only need Glibc (in step 3). # stdenv. We only need Glibc (in step 3).
stdenvLinuxBoot1Pkgs = allPackages { stdenvLinuxBoot1Pkgs = allPackages {
inherit system;
bootStdenv = stdenvLinuxBoot1; bootStdenv = stdenvLinuxBoot1;
}; };
@ -172,6 +173,7 @@ rec {
# 5) The packages that can be built using the second stdenv. # 5) The packages that can be built using the second stdenv.
stdenvLinuxBoot2Pkgs = allPackages { stdenvLinuxBoot2Pkgs = allPackages {
inherit system;
bootStdenv = stdenvLinuxBoot2; bootStdenv = stdenvLinuxBoot2;
}; };
@ -190,6 +192,7 @@ rec {
# 7) The packages that can be built using the third stdenv. # 7) The packages that can be built using the third stdenv.
stdenvLinuxBoot3Pkgs = allPackages { stdenvLinuxBoot3Pkgs = allPackages {
inherit system;
bootStdenv = stdenvLinuxBoot3; bootStdenv = stdenvLinuxBoot3;
}; };