diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-05-26 00:24:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 00:24:28 -0400 |
| commit | d3082a31cd0055e8ef8c72636d9866a52c936e4f (patch) | |
| tree | 57d3ea613a0f3cb14aadfc5f6036852de72efc2b /pkgs/top-level/all-packages.nix | |
| parent | 204ea0bfb7e4dcf41c91a6d14e58d42fe08ef9c3 (diff) | |
| parent | 5e716bf469f616c34db40aa81d9b9c95e7aa22e5 (diff) | |
| download | nixlib-d3082a31cd0055e8ef8c72636d9866a52c936e4f.tar nixlib-d3082a31cd0055e8ef8c72636d9866a52c936e4f.tar.gz nixlib-d3082a31cd0055e8ef8c72636d9866a52c936e4f.tar.bz2 nixlib-d3082a31cd0055e8ef8c72636d9866a52c936e4f.tar.lz nixlib-d3082a31cd0055e8ef8c72636d9866a52c936e4f.tar.xz nixlib-d3082a31cd0055e8ef8c72636d9866a52c936e4f.tar.zst nixlib-d3082a31cd0055e8ef8c72636d9866a52c936e4f.zip | |
Merge pull request #87544 from bcdarwin/vtk-8
vtk: 7.1.1 -> 8.2.0
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062e5bc97bc1..ae8d293f9628 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15000,6 +15000,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; @@ -15039,7 +15047,7 @@ in }); }; - vtkWithQt4 = vtk.override { qtLib = qt4; }; + vtkWithQt5 = vtk.override { qtLib = qt5; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; |