diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 16:41:56 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 16:41:56 +0100 |
commit | f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf (patch) | |
tree | 5feb099e89c1209f55d9b9b036b58aa3f1be2b3c /pkgs/stdenv/linux | |
parent | cf8daf63120adedbeaf5bc8c2f396be2496a741e (diff) | |
download | nixlib-f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf.tar nixlib-f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf.tar.gz nixlib-f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf.tar.bz2 nixlib-f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf.tar.lz nixlib-f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf.tar.xz nixlib-f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf.tar.zst nixlib-f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf.zip |
Remove trailing whitespace
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 777b2cf6a328..38d6d5f5ee12 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -32,11 +32,11 @@ rec { # The bootstrap process proceeds in several steps. - + # 1) Create a standard environment by downloading pre-built binaries # of coreutils, GCC, etc. - + # This function downloads a file. download = {url, sha256}: derivation { name = baseNameOf (toString url); @@ -49,31 +49,31 @@ rec { impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; }; - + # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). bootstrapTools = derivation { name = "bootstrap-tools"; - + builder = bootstrapFiles.sh; - + args = if system == "armv5tel-linux" then [ ./scripts/unpack-bootstrap-tools-arm.sh ] else [ ./scripts/unpack-bootstrap-tools.sh ]; - + inherit (bootstrapFiles) bzip2 mkdir curl cpio; - + tarball = download { inherit (bootstrapFiles.bootstrapTools) url sha256; }; - + inherit system; - + # Needed by the GCC wrapper. langC = true; langCC = true; }; - + # This function builds the various standard environments used during # the bootstrap. @@ -109,7 +109,7 @@ rec { fetchurl = null; }; - + fetchurl = import ../../build-support/fetchurl { stdenv = stdenvLinuxBoot0; curl = bootstrapTools; @@ -133,7 +133,7 @@ rec { # A helper function to call gcc-wrapper. wrapGCC = {gcc ? bootstrapTools, libc, binutils, coreutils, shell ? "", name ? "bootstrap-gcc-wrapper"}: - + import ../../build-support/gcc-wrapper { nativeTools = false; nativeLibc = false; @@ -153,7 +153,7 @@ rec { }; inherit fetchurl; }; - + # 2) These are the packages that we can build with the first # stdenv. We only need binutils, because recent Glibcs @@ -164,7 +164,7 @@ rec { bootStdenv = stdenvLinuxBoot1; }; - + # 3) 2nd stdenv that we will use to build only the glibc. stdenvLinuxBoot2 = stdenvBootFun { gcc = wrapGCC { @@ -186,12 +186,12 @@ rec { bootStdenv = stdenvLinuxBoot2; }; - + # 5) Build Glibc with the bootstrap tools. The result is the full, # dynamically linked, final Glibc. stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc; - + # 6) Construct a third stdenv identical to the 2nd, except that # this one uses the Glibc built in step 3. It still uses # the recent binutils and rest of the bootstrap tools, including GCC. @@ -217,14 +217,14 @@ rec { inherit fetchurl; }; - + # 7) The packages that can be built using the third stdenv. stdenvLinuxBoot3Pkgs = allPackages { inherit system platform; bootStdenv = stdenvLinuxBoot3; }; - + # 8) Construct a fourth stdenv identical to the second, except that # this one uses the dynamically linked GCC and Binutils from step # 5. The other tools (e.g. coreutils) are still from the @@ -245,14 +245,14 @@ rec { inherit fetchurl; }; - + # 9) The packages that can be built using the fourth stdenv. stdenvLinuxBoot4Pkgs = allPackages { inherit system platform; bootStdenv = stdenvLinuxBoot4; }; - + # 10) Construct the final stdenv. It uses the Glibc, GCC and # Binutils built above, and adds in dynamically linked versions # of all other tools. @@ -262,10 +262,10 @@ rec { # first binutils built. stdenvLinux = import ../generic rec { inherit system config; - + preHook = commonPreHook; - - initialPath = + + initialPath = ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;}) ++ [stdenvLinuxBoot4Pkgs.patchelf]; @@ -279,9 +279,9 @@ rec { }; shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash"; - + fetchurlBoot = fetchurl; - + extraAttrs = { inherit (stdenvLinuxBoot3Pkgs) glibc; inherit platform; |