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

Indentation

Browse Source
This commit is contained in:
Eelco Dolstra 2014-08-24 18:08:23 +02:00
parent 0f7cb13f38
commit 27d3984935
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,32 +85,35 @@ rec {
{gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}: {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
let let
thisStdenv = import ../generic {
inherit system config; thisStdenv = import ../generic {
name = "stdenv-linux-boot"; inherit system config;
preHook = name = "stdenv-linux-boot";
'' preHook =
# Don't patch #!/interpreter because it leads to retained ''
# dependencies on the bootstrapTools in the final stdenv. # Don't patch #!/interpreter because it leads to retained
dontPatchShebangs=1 # dependencies on the bootstrapTools in the final stdenv.
${commonPreHook} dontPatchShebangs=1
''; ${commonPreHook}
shell = "${bootstrapTools}/bin/sh"; '';
initialPath = [bootstrapTools] ++ extraPath; shell = "${bootstrapTools}/bin/sh";
fetchurlBoot = import ../../build-support/fetchurl { initialPath = [bootstrapTools] ++ extraPath;
stdenv = stage0.stdenv; fetchurlBoot = import ../../build-support/fetchurl {
curl = bootstrapTools; 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 thisPkgs = allPackages {
# linuxHeaders for example. inherit system platform;
extraAttrs = extraAttrs // { inherit platform; }; bootStdenv = thisStdenv;
overrides = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; }; };
};
thisPkgs = allPackages {
inherit system platform;
bootStdenv = thisStdenv;
};
in { stdenv = thisStdenv; pkgs = thisPkgs; }; in { stdenv = thisStdenv; pkgs = thisPkgs; };