stdenv linux, stdenv cross: Harmonize extraNativeBuildInputs

Want to make sure these are the same per host platform, without duplication.
2018-09-18 16:27:04 -04:00
parent 2111e7b742
commit f2bb59e710
2 changed files with 13 additions and 7 deletions
@@ -53,12 +53,15 @@ in lib.init bootStages ++ [
           else buildPackages.gcc;

      extraNativeBuildInputs = old.extraNativeBuildInputs
+        ++ lib.optionals
+             (hostPlatform.isLinux && !buildPlatform.isLinux)
+             [ buildPackages.patchelf buildPackages.paxctl ]
+        ++ lib.optional
+             (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
+             buildPackages.updateAutotoolsGnuConfigScriptsHook
           # without proper `file` command, libtool sometimes fails
           # to recognize 64-bit DLLs
        ++ lib.optional (hostPlatform.config == "x86_64-w64-mingw32") buildPackages.file
-        ++ lib.optional
-             (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
-             buildPackages.updateAutotoolsGnuConfigScriptsHook
        ;
    });
  })