From f49ca01c50c37d5f050fc5053d48e0605d10d4f8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 26 Sep 2018 11:26:27 -0400 Subject: [PATCH] Revert "stdenv: partial revert of f2bb59e" This reverts commit 607063f61be3b19a2da054776b360d9c5b03038a. --- pkgs/stdenv/cross/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index d1efa360237..daa9f66615c 100644 --- 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