cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vtk_9: 9.0.3 -> 9.1.0

Browse source
This commit is contained in:
Ben Darwin 2022-08-05 11:14:25 -04:00
parent 0d440c1811
commit a2bbcde74e
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 { import ./generic.nix {
majorVersion = "9.0"; majorVersion = "9.1";
minorVersion = "3"; minorVersion = "0";
sourceSha256 = "vD65Ylsrjb/stgUqKrCR/JFAXeQzOw7GjzMjgVFU7Yo="; sourceSha256 = "sha256-j+1C9Pjx64CDEHto6qmtcdoHEQFhoxFq2Af0PlylzpY=";
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=";
}
];
} }

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

@ -1,7 +1,7 @@
{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }:
{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff
, fetchpatch , 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." , enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given."
# Darwin support # Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libpng libtiff ] 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 [ ++ optionals stdenv.isLinux [
libGLU libGLU
libGL libGL