diff options
| author | Ben Darwin <bcdarwin@gmail.com> | 2020-04-27 18:23:44 -0400 |
|---|---|---|
| committer | Ben Darwin <bcdarwin@gmail.com> | 2020-05-04 10:47:27 -0400 |
| commit | e72b2beab026f1e9908cab53f2773a61256e4a72 (patch) | |
| tree | dc32d5fe86a6e09bb3939ace62fdab04f605f8e3 | |
| parent | 24bc2b8be3dcc1d5b8b0deade50b0a8946a09cb4 (diff) | |
| download | nixpkgs-e72b2beab026f1e9908cab53f2773a61256e4a72.tar nixpkgs-e72b2beab026f1e9908cab53f2773a61256e4a72.tar.gz nixpkgs-e72b2beab026f1e9908cab53f2773a61256e4a72.tar.bz2 nixpkgs-e72b2beab026f1e9908cab53f2773a61256e4a72.tar.lz nixpkgs-e72b2beab026f1e9908cab53f2773a61256e4a72.tar.xz nixpkgs-e72b2beab026f1e9908cab53f2773a61256e4a72.tar.zst nixpkgs-e72b2beab026f1e9908cab53f2773a61256e4a72.zip | |
vtk: unbreak on OS X
| -rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 6a7e26c753c..1cc706f4eb7 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; 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)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfea73736d6..f6782e37699 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14844,7 +14844,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { - stdenv = gcc8Stdenv; + stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration |