public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vtk: unbreak on OS X

Browse Source
This commit is contained in:
Ben Darwin
2020-05-04 10:47:27 -04:00
parent 24bc2b8be3
commit e72b2beab0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/vtk/default.nix
+1 -1
View File
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c
sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c
''; '';
pkgs/top-level/all-packages.nix
+1 -1
View File
@@ -14844,7 +14844,7 @@ in
vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
vtk = callPackage ../development/libraries/vtk { vtk = callPackage ../development/libraries/vtk {
stdenv = gcc8Stdenv; stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv;
inherit (darwin) libobjc; inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration