diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-24 18:08:23 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-24 18:08:23 +0200 |
commit | 27d39849355d1a39f8538d09c52e04f8f87510ea (patch) | |
tree | 3946163fb2254315cc320e85133c914330c1ba64 /pkgs/stdenv | |
parent | 0f7cb13f38d2c3a86d610f254d00c3b72ca4bd7d (diff) | |
download | nixlib-27d39849355d1a39f8538d09c52e04f8f87510ea.tar nixlib-27d39849355d1a39f8538d09c52e04f8f87510ea.tar.gz nixlib-27d39849355d1a39f8538d09c52e04f8f87510ea.tar.bz2 nixlib-27d39849355d1a39f8538d09c52e04f8f87510ea.tar.lz nixlib-27d39849355d1a39f8538d09c52e04f8f87510ea.tar.xz nixlib-27d39849355d1a39f8538d09c52e04f8f87510ea.tar.zst nixlib-27d39849355d1a39f8538d09c52e04f8f87510ea.zip |
Indentation
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6d54228978f4..80bc982267b5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -85,32 +85,35 @@ rec { {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}: let - thisStdenv = import ../generic { - inherit system config; - name = "stdenv-linux-boot"; - preHook = - '' - # Don't patch #!/interpreter because it leads to retained - # dependencies on the bootstrapTools in the final stdenv. - dontPatchShebangs=1 - ${commonPreHook} - ''; - shell = "${bootstrapTools}/bin/sh"; - initialPath = [bootstrapTools] ++ extraPath; - fetchurlBoot = import ../../build-support/fetchurl { - stdenv = stage0.stdenv; - curl = bootstrapTools; + + thisStdenv = import ../generic { + inherit system config; + name = "stdenv-linux-boot"; + preHook = + '' + # Don't patch #!/interpreter because it leads to retained + # dependencies on the bootstrapTools in the final stdenv. + dontPatchShebangs=1 + ${commonPreHook} + ''; + shell = "${bootstrapTools}/bin/sh"; + initialPath = [bootstrapTools] ++ extraPath; + fetchurlBoot = import ../../build-support/fetchurl { + stdenv = stage0.stdenv; + curl = bootstrapTools; + }; + inherit gcc; + # Having the proper 'platform' in all the stdenvs allows getting proper + # linuxHeaders for example. + extraAttrs = extraAttrs // { inherit platform; }; + overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; }; - inherit gcc; - # Having the proper 'platform' in all the stdenvs allows getting proper - # linuxHeaders for example. - extraAttrs = extraAttrs // { inherit platform; }; - overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; - }; - thisPkgs = allPackages { - inherit system platform; - bootStdenv = thisStdenv; - }; + + thisPkgs = allPackages { + inherit system platform; + bootStdenv = thisStdenv; + }; + in { stdenv = thisStdenv; pkgs = thisPkgs; }; |