Revert "stdenv: partial revert of f2bb59e"

This reverts commit 607063f61b.
2018-09-26 11:26:27 -04:00 · 2018-09-26 11:26:27 -04:00 · f49ca01c50
commit f49ca01c50
parent a3fd29883a
1 changed files with 3 additions and 0 deletions
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@ -53,6 +53,9 @@ 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