diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-07 15:03:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 15:03:02 -0400 |
| commit | 5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39 (patch) | |
| tree | f7e1d1fa8358b233a43ab5c23b60022dbf11c7b2 /pkgs | |
| parent | 05d6273357a659c961046905ae8e6a18618be858 (diff) | |
| parent | 424f467e06daa3363581ebef8ea354dbbfeb3cf5 (diff) | |
| download | nixlib-5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39.tar nixlib-5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39.tar.gz nixlib-5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39.tar.bz2 nixlib-5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39.tar.lz nixlib-5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39.tar.xz nixlib-5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39.tar.zst nixlib-5fdb9f3ba0bdaa2dc3e11b3ef8294f23c6677d39.zip | |
Merge pull request #61096 from matthewbauer/update-ios-gnu-config
cross: use newer gnu-config on iOS
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 201c93786823..3bc4cd9a8faa 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -64,7 +64,7 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc"; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc" || p.isiOS; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs |