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 | |
| parent | f7f356a9c91644fc81de42482cac85be4fa1b8d5 (diff) | |
| parent | 699fae259deb8ee121fc9e539e71285d60666126 (diff) | |
Merge pull request #69309 from matthewbauer/androidx86
androidndk: get correct libs for x86_64
| -rw-r--r-- | pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 02aa6567c1a..6bcfcfc3023 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -103,6 +103,6 @@ rec { cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include chmod +w $out/include cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include - ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib + ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib ''; } diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index de31128e5a6..d9ea5a71dd3 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; |