diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-25 18:52:30 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-09-25 19:21:46 -0400 |
| commit | c455adcc42f9b2b62376b9fee99a0c5004a52425 (patch) | |
| tree | 8b489f54e79aa7710554a1a4f3c1e58cfe32890f /pkgs/development/libraries | |
| parent | eab41878ac16a80b1189d5e4aeec5e037f6571db (diff) | |
| parent | 96ac71d680fe8d07e51fa979b0818b9aae06e1ec (diff) | |
| download | nixlib-c455adcc42f9b2b62376b9fee99a0c5004a52425.tar nixlib-c455adcc42f9b2b62376b9fee99a0c5004a52425.tar.gz nixlib-c455adcc42f9b2b62376b9fee99a0c5004a52425.tar.bz2 nixlib-c455adcc42f9b2b62376b9fee99a0c5004a52425.tar.lz nixlib-c455adcc42f9b2b62376b9fee99a0c5004a52425.tar.xz nixlib-c455adcc42f9b2b62376b9fee99a0c5004a52425.tar.zst nixlib-c455adcc42f9b2b62376b9fee99a0c5004a52425.zip | |
Merge branch 'master' into staging-next
Fixes eval on darwin after #69072 Resolved conflict in pkgs/tools/security/thc-hydra/default.nix Basically had to revert a1c0e10564f9a6281e14d7a7279b8589521e2c48 which adapts #69210 to master that doesn't yet have 329a88efa78126ae7413807ce58000eab49e82d9 Tested using maintainers/scripts/eval-release.sh before and after to see that the fix works
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gmp/6.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 8 |
2 files changed, 6 insertions, 4 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; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index c0b8fd7d1679..3cb8998485a9 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; }; - buildInputs = [ cmake ] + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtiff ] ++ optional (qtLib != null) qtLib ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { # built and requiring one of the shared objects. # At least, we use -fPIC for other packages to be able to use this in shared # objects. - cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; |