diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-07 16:37:13 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-09 10:34:51 +0000 |
| commit | 87e4e71e0ff2b921c6d75b79acb4493738186cbf (patch) | |
| tree | 29b53aa452d3df25319d8902d77b6d5af1200293 | |
| parent | 1dc80934f0be86542c043c6632f6b66c9c1bc421 (diff) | |
| download | nixpkgs-87e4e71e0ff2b921c6d75b79acb4493738186cbf.tar nixpkgs-87e4e71e0ff2b921c6d75b79acb4493738186cbf.tar.gz nixpkgs-87e4e71e0ff2b921c6d75b79acb4493738186cbf.tar.bz2 nixpkgs-87e4e71e0ff2b921c6d75b79acb4493738186cbf.tar.lz nixpkgs-87e4e71e0ff2b921c6d75b79acb4493738186cbf.tar.xz nixpkgs-87e4e71e0ff2b921c6d75b79acb4493738186cbf.tar.zst nixpkgs-87e4e71e0ff2b921c6d75b79acb4493738186cbf.zip | |
vtk: Fix build with mesa 19.2.3
| -rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 3cb8998485a..482d691fc7c 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, libtiff +{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtiff ] ++ optional (qtLib != null) qtLib - ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ] + ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT ]; @@ -40,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" "-DVTK_USE_SYSTEM_TIFF=1" ] + cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; |