MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #185489 from bcdarwin/vtk-9-update

Browse source 
vtk_9: 9.0.3 -> 9.1.0
This commit is contained in:
Mario Rodas 2022-08-13 01:08:36 -05:00 committed by GitHub
commit 5483f40b9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/libraries/vtk/9.x.nix
View file

@ -1,14 +1,5 @@
import ./generic.nix {
majorVersion = "9.0";
minorVersion = "3";
sourceSha256 = "vD65Ylsrjb/stgUqKrCR/JFAXeQzOw7GjzMjgVFU7Yo=";
patchesToFetch = [
# Add missing header includes.
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611
{
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/e066c3f4fbbfe7470c6207db0fc3f3952db633cb.patch";
sha256 = "ggmDisS3qoMquOqrmIYlCIT7TLxP/DUtW29ktjaEnlM=";
}
];
majorVersion = "9.1";
minorVersion = "0";
sourceSha256 = "sha256-j+1C9Pjx64CDEHto6qmtcdoHEQFhoxFq2Af0PlylzpY=";
}

6
pkgs/development/libraries/vtk/generic.nix
View file

@ -1,7 +1,7 @@
{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff
, fetchpatch
, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools
, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv
, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libpng libtiff ]
++ optionals enableQt [ qtbase qtx11extras qttools ]
++ optionals enableQt (if lib.versionOlder majorVersion "9"
then [ qtbase qtx11extras qttools ]
else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ])
++ optionals stdenv.isLinux [
libGLU
libGL