Merge pull request #178291 from veprbl/pr/vtk_9_darwin_fix

vtk: unbreak on darwin using VTK_VERSIONED_INSTALL

authored by Dmitry Kalinkin and committed by GitHub e300ce18 0929936b

+6 -12
+3 -11
pkgs/development/libraries/vtk/generic.nix
··· 73 73 "-DCMAKE_INSTALL_LIBDIR=lib" 74 74 "-DCMAKE_INSTALL_INCLUDEDIR=include" 75 75 "-DCMAKE_INSTALL_BINDIR=bin" 76 + "-DVTK_VERSIONED_INSTALL=OFF" 76 77 ] ++ optionals enableQt [ 77 78 "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" 78 79 ] ++ optionals (enableQt && lib.versionOlder version "8.0") [ ··· 90 91 sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c 91 92 ''; 92 93 93 - preFixup = '' 94 - for lib in $out/lib/libvtk*.so; do 95 - ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')" 96 - done 97 - 98 - mv $out/include/vtk-${majorVersion}/* $out/include 99 - rmdir $out/include/vtk-${majorVersion} 100 - ln -s $out/include $out/include/vtk-${majorVersion} 101 - ''; 102 - 103 94 meta = with lib; { 104 - broken = stdenv.isDarwin; 105 95 description = "Open source libraries for 3D computer graphics, image processing and visualization"; 106 96 homepage = "https://www.vtk.org/"; 107 97 license = licenses.bsd3; 108 98 maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ]; 109 99 platforms = with platforms; unix; 100 + # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope 101 + broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8"); 110 102 }; 111 103 }
+3 -1
pkgs/top-level/all-packages.nix
··· 9862 9862 9863 9863 rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; 9864 9864 9865 - rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { }; 9865 + rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { 9866 + pcl = pcl.override { vtk = vtkWithQt5; }; 9867 + }; 9866 9868 9867 9869 rtaudio = callPackage ../development/libraries/audio/rtaudio { 9868 9870 jack = libjack2;