about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorBen Darwin <bcdarwin@gmail.com>2020-05-10 16:21:26 -0400
committerBen Darwin <bcdarwin@gmail.com>2020-05-11 17:54:29 -0400
commit5e716bf469f616c34db40aa81d9b9c95e7aa22e5 (patch)
treefdad056772897e57c3da67b936e55f3992a25159 /pkgs/top-level/all-packages.nix
parent24fcef1b9eca0861d4575f649306429ae3279412 (diff)
downloadnixlib-5e716bf469f616c34db40aa81d9b9c95e7aa22e5.tar
nixlib-5e716bf469f616c34db40aa81d9b9c95e7aa22e5.tar.gz
nixlib-5e716bf469f616c34db40aa81d9b9c95e7aa22e5.tar.bz2
nixlib-5e716bf469f616c34db40aa81d9b9c95e7aa22e5.tar.lz
nixlib-5e716bf469f616c34db40aa81d9b9c95e7aa22e5.tar.xz
nixlib-5e716bf469f616c34db40aa81d9b9c95e7aa22e5.tar.zst
nixlib-5e716bf469f616c34db40aa81d9b9c95e7aa22e5.zip
vtk: 7.1.1 -> 8.2.0
- also create vtk_7 as several packages don't build with 8.x:
  - itk5: vtkVersion.h header not found at compile time
  - ants: version in tree (2.2.0) is incompatible with 8.2
  - itk4: ants depends on both vtk and itk4, so use vtk_7
  - gdcm: vtk header issue
  - python3Packages.vtk: Python C API compilation error with Python 3.8

- upgrade vtkWithQt4 -> vtkWithQt5
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 661bc75daaa4..924c68cf00db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14872,6 +14872,14 @@ in
   vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
 
   vtk = callPackage ../development/libraries/vtk {
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.libs) xpc;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
+                                          IOKit CFNetwork Security ApplicationServices
+                                          CoreText IOSurface ImageIO OpenGL GLUT;
+  };
+
+  vtk_7 = callPackage ../development/libraries/vtk/7.x.nix {
     stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv;
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.libs) xpc;
@@ -14911,7 +14919,7 @@ in
     });
   };
 
-  vtkWithQt4 = vtk.override { qtLib = qt4; };
+  vtkWithQt5 = vtk.override { qtLib = qt5; };
 
   vxl = callPackage ../development/libraries/vxl {
     libpng = libpng12;