ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

vtk: cleanup

Browse Source 
Remove unnecessary conditionals for obsolete VTK versions no longer in
tree.
Lift `version` and remove `rec` from argument of `mkDerivation`.

This change does not affect the derivation produced for VTK 9 (at least
on x64 Linux).
This commit is contained in:
Ben Darwin 2023-11-11 12:02:28 -05:00
parent 9c19bc1a55
commit d6179b9625
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv
, enableQt ? false, qtx11extras, qttools, qtdeclarative, qtEnv
, enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given."
# Darwin support
, AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@ -11,11 +11,12 @@
let
inherit (lib) optionalString optionals optional;
version = "${majorVersion}.${minorVersion}";
pythonMajor = lib.substring 0 1 python.pythonVersion;
in stdenv.mkDerivation rec {
in stdenv.mkDerivation {
pname = "vtk${optionalString enableQt "-qvtk"}";
version = "${majorVersion}.${minorVersion}";
inherit version;
src = fetchurl {
url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz";
@ -25,9 +26,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libpng libtiff ]
++ optionals enableQt (if lib.versionOlder majorVersion "9"
then [ qtbase qtx11extras qttools ]
else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ])
++ optionals enableQt [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ]
++ optionals stdenv.isLinux [
libGLU
xorgproto
@ -66,8 +65,8 @@ in stdenv.mkDerivation rec {
cmakeFlags = [
"-DCMAKE_C_FLAGS=-fPIC"
"-DCMAKE_CXX_FLAGS=-fPIC"
"-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_PNG" else "VTK_MODULE_USE_EXTERNAL_vtkpng"}=ON"
"-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_TIFF" else "VTK_MODULE_USE_EXTERNAL_vtktiff"}=1"
"-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON"
"-DVTK_MODULE_USE_EXTERNAL_vtktiff=1"
] ++ lib.optionals (!stdenv.isDarwin) [
"-DOPENGL_INCLUDE_DIR=${libGL}/include"
] ++ [
@ -76,9 +75,7 @@ in stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DVTK_VERSIONED_INSTALL=OFF"
] ++ optionals enableQt [
"-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}"
] ++ optionals (enableQt && lib.versionOlder version "8.0") [
"-DVTK_QT_VERSION=5"
"-DVTK_GROUP_ENABLE_Qt:STRING=YES"
]
++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optionals enablePython [
@ -105,7 +102,5 @@ in stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
platforms = with platforms; unix;
# /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope
broken = stdenv.isDarwin && (lib.versions.major majorVersion == "8");
};
}