diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-15 11:30:45 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-15 18:24:54 -0400 |
commit | eeabf85780e7fccc0289b4015b695e28ef166ab7 (patch) | |
tree | 9eb4066d881737598ccb002783435b325fa74a35 /pkgs/stdenv/linux | |
parent | a71cf06b162b98282a7688f8ac221498cfd6a7e2 (diff) | |
download | nixlib-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar nixlib-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.gz nixlib-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.bz2 nixlib-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.lz nixlib-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.xz nixlib-eeabf85780e7fccc0289b4015b695e28ef166ab7.tar.zst nixlib-eeabf85780e7fccc0289b4015b695e28ef166ab7.zip |
stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs`
Additionally, instead of pulling them from `setup.sh`, route them via Nix. This gets us one step closer to making stdenv be a plain attribute set instead of a derivation.
Diffstat (limited to 'pkgs/stdenv/linux')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 61262e1a64e5..0167e51f2fdd 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -47,7 +47,7 @@ let # the bootstrap. In all stages, we build an stdenv and the package # set that can be built with that stdenv. stageFun = prevStage: - { name, overrides ? (self: super: {}), extraBuildInputs ? [] }: + { name, overrides ? (self: super: {}), extraNativeBuildInputs ? [] }: let @@ -56,7 +56,7 @@ let buildPlatform = localSystem; hostPlatform = localSystem; targetPlatform = localSystem; - inherit config extraBuildInputs; + inherit config extraNativeBuildInputs; preHook = '' # Don't patch #!/interpreter because it leads to retained @@ -219,7 +219,7 @@ in isl = isl_0_14; }; }; - extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ + extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; }) @@ -253,7 +253,7 @@ in shell = self.bash + "/bin/bash"; }; }; - extraBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ + extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; }) @@ -283,7 +283,7 @@ in initialPath = ((import ../common-path.nix) {pkgs = prevStage;}); - extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ + extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; |