diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-26 15:52:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-26 15:52:31 -0400 |
| commit | e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5 (patch) | |
| tree | 6a3cc98e83959c3c57cabb37658a68ea999c6f18 /pkgs/stdenv | |
| parent | 07cc937d60dcb6f752cf39997458acbadc40ae7d (diff) | |
| parent | f49ca01c50c37d5f050fc5053d48e0605d10d4f8 (diff) | |
| download | nixlib-e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5.tar nixlib-e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5.tar.gz nixlib-e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5.tar.bz2 nixlib-e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5.tar.lz nixlib-e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5.tar.xz nixlib-e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5.tar.zst nixlib-e59a2ef7ebdc014691cbcdcf5fbaa424a148d6f5.zip | |
Merge pull request #47400 from obsidiansystems/paxctl-darwin-no-mass-rebuild
paxctl: Fix darwin and cross without mass-rebuild
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index d1efa3602374..daa9f66615c9 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 |