vtk: build with system libtiff
fixes vtktiff, therefore at least gdcm
This commit is contained in:
parent
feca695a34
commit
2d6fbcd94e
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt
|
{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff
|
||||||
, qtLib ? null
|
, qtLib ? null
|
||||||
# Darwin support
|
# Darwin support
|
||||||
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
|
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
|
||||||
@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
|
sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ cmake ]
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
|
buildInputs = [ libtiff ]
|
||||||
++ optional (qtLib != null) qtLib
|
++ optional (qtLib != null) qtLib
|
||||||
++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
|
++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
|
||||||
++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
|
++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
|
||||||
@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||||||
# built and requiring one of the shared objects.
|
# built and requiring one of the shared objects.
|
||||||
# At least, we use -fPIC for other packages to be able to use this in shared
|
# At least, we use -fPIC for other packages to be able to use this in shared
|
||||||
# objects.
|
# 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 (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
|
||||||
++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
|
++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user