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-18 12:02:13 -0400 |
commit | fbab1d485b60f30af7f2403085c269dfa24b9984 (patch) | |
tree | 911a9f16a8eb18dbfb289b9e24d77b9de51cd038 /pkgs/stdenv/linux | |
parent | 7320fa9d4581e634fec4db848d7a4d157a51303d (diff) | |
download | nixlib-fbab1d485b60f30af7f2403085c269dfa24b9984.tar nixlib-fbab1d485b60f30af7f2403085c269dfa24b9984.tar.gz nixlib-fbab1d485b60f30af7f2403085c269dfa24b9984.tar.bz2 nixlib-fbab1d485b60f30af7f2403085c269dfa24b9984.tar.lz nixlib-fbab1d485b60f30af7f2403085c269dfa24b9984.tar.xz nixlib-fbab1d485b60f30af7f2403085c269dfa24b9984.tar.zst nixlib-fbab1d485b60f30af7f2403085c269dfa24b9984.zip |
stdenvs: Distinguish between `extraBuildInputs` and `extraNativeBuildInputs`
This version continues to use bash + stdenv/setup for the default inputs.
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; |