dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

vtkWithQt4: actually build QVTK libs/headers (#84772)

Browse Source 
- VTK_USE_QT is obsolete and didn't have the intended effect
This commit is contained in:
Ben Darwin 2020-04-29 19:11:14 -04:00 committed by GitHub
parent babf5477f5
commit 948b38300d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/vtk/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# 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" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] 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 (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Open source libraries for 3D computer graphics, image processing and visualization"; description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "http://www.vtk.org/"; homepage = "https://www.vtk.org/";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
platforms = with stdenv.lib.platforms; unix; platforms = with stdenv.lib.platforms; unix;