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

Cosmetic renaming: extraPath -> extraBuildInputs

Browse Source
This commit is contained in:
Gergely Risko 2014-09-14 19:37:32 +02:00
parent 034b07e6ff
commit 4ac4af08f2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,13 +79,12 @@ rec {
# the bootstrap. In all stages, we build an stdenv and the package # the bootstrap. In all stages, we build an stdenv and the package
# set that can be built with that stdenv. # set that can be built with that stdenv.
stageFun = stageFun =
{gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}: {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraBuildInputs ? []}:
let let
thisStdenv = import ../generic { thisStdenv = import ../generic {
inherit system config; inherit system config extraBuildInputs;
extraBuildInputs = extraPath;
name = "stdenv-linux-boot"; name = "stdenv-linux-boot";
preHook = preHook =
'' ''
@ -207,7 +206,7 @@ rec {
extraAttrs = { extraAttrs = {
glibc = stage2.pkgs.glibc; # Required by gcc47 build glibc = stage2.pkgs.glibc; # Required by gcc47 build
}; };
extraPath = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];
}; };
@ -221,10 +220,10 @@ rec {
coreutils = bootstrapTools; coreutils = bootstrapTools;
name = ""; name = "";
}; };
extraPath = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
overrides = pkgs: { overrides = pkgs: {
inherit (stage3.pkgs) gettext gnum4 gmp perl glibc; inherit (stage3.pkgs) gettext gnum4 gmp perl glibc;
}; };
extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
}; };