diff options
author | John Ericson <Ericson2314@yahoo.com> | 2017-08-16 16:52:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-16 16:52:40 -0400 |
commit | 9289365627ce6b82d9ec2f3029e82aa8fc93e655 (patch) | |
tree | 4423b9c0570c275aa8bf1054c39505433dcee11c /pkgs/stdenv/linux | |
parent | 6e245440d427a3ad08c73a037ba2f7706b884051 (diff) | |
parent | 63428ebab97e917cbd5820215c49ead6fb91e7d3 (diff) | |
download | nixlib-9289365627ce6b82d9ec2f3029e82aa8fc93e655.tar nixlib-9289365627ce6b82d9ec2f3029e82aa8fc93e655.tar.gz nixlib-9289365627ce6b82d9ec2f3029e82aa8fc93e655.tar.bz2 nixlib-9289365627ce6b82d9ec2f3029e82aa8fc93e655.tar.lz nixlib-9289365627ce6b82d9ec2f3029e82aa8fc93e655.tar.xz nixlib-9289365627ce6b82d9ec2f3029e82aa8fc93e655.tar.zst nixlib-9289365627ce6b82d9ec2f3029e82aa8fc93e655.zip |
Merge pull request #28304 from obsidiansystems/stdenv-extra-inputs
stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs`
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; |