diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-09-26 02:09:22 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-26 11:13:22 -0400 |
| commit | 607063f61be3b19a2da054776b360d9c5b03038a (patch) | |
| tree | cac08baa964f8efa59caee97ba4d477c68202bb5 /pkgs/stdenv/cross/default.nix | |
| parent | 21c2437cc6017380073ebc67355610596dc51a25 (diff) | |
| download | nixpkgs-607063f61be3b19a2da054776b360d9c5b03038a.tar nixpkgs-607063f61be3b19a2da054776b360d9c5b03038a.tar.gz nixpkgs-607063f61be3b19a2da054776b360d9c5b03038a.tar.bz2 nixpkgs-607063f61be3b19a2da054776b360d9c5b03038a.tar.lz nixpkgs-607063f61be3b19a2da054776b360d9c5b03038a.tar.xz nixpkgs-607063f61be3b19a2da054776b360d9c5b03038a.tar.zst nixpkgs-607063f61be3b19a2da054776b360d9c5b03038a.zip | |
stdenv: partial revert of f2bb59e
/cc @Ericson2314 PR was https://github.com/NixOS/nixpkgs/pull/46857 This line broke MacOS cross compilation. paxctl cannot be built on macOS. Maybe it can be fixed, but no reason to break things unnecessarily. Regardless, you definitely need to be more careful about backporting. I think it’s fine to move fast and break things on master but with release-18.09 we should be more careful. Something like more automated testing for cross compilation would also be helpful (hopefully even making it block). (cherry picked from commit f9c4075873cb56464126f993d22a1a72f7cfac45)
Diffstat (limited to 'pkgs/stdenv/cross/default.nix')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index daa9f66615c..d1efa360237 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -53,9 +53,6 @@ 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 |