nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues 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
# set that can be built with that stdenv.
stageFun =
{gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? []}:
{gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraBuildInputs ? []}:
let
thisStdenv = import ../generic {
inherit system config;
extraBuildInputs = extraPath;
inherit system config extraBuildInputs;
name = "stdenv-linux-boot";
preHook =
''
@ -207,7 +206,7 @@ rec {
extraAttrs = {
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;
name = "";
};
extraPath = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
overrides = pkgs: {
inherit (stage3.pkgs) gettext gnum4 gmp perl glibc;
};
extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
};