diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-24 09:48:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-24 09:48:43 -0400 |
| commit | feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee (patch) | |
| tree | fbcdf32734fc18d45919df3d10d12b16ff0cb490 /pkgs/development/libraries | |
| parent | f7f356a9c91644fc81de42482cac85be4fa1b8d5 (diff) | |
| parent | 699fae259deb8ee121fc9e539e71285d60666126 (diff) | |
| download | nixlib-feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee.tar nixlib-feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee.tar.gz nixlib-feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee.tar.bz2 nixlib-feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee.tar.lz nixlib-feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee.tar.xz nixlib-feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee.tar.zst nixlib-feca695a34e224b2ef5f4b5a3e6bcc2b1e38c5ee.zip | |
Merge pull request #69309 from matthewbauer/androidx86
androidndk: get correct libs for x86_64
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index de31128e5a67..d9ea5a71dd30 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec { "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" - ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" + ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly" ; doCheck = true; # not cross; |