diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-05-09 15:03:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-09 15:03:28 -0400 |
| commit | e80302dc7dd9424860c118042707ed0f30fe2c2f (patch) | |
| tree | 1c5baa713cd8481c867742b248f689bbe63fd423 /pkgs/top-level/all-packages.nix | |
| parent | 8ceef190c15c239af5232fd30c09fe26602e3934 (diff) | |
| parent | 5caa76705bd839fb6733f64740dec95d7b2fefc5 (diff) | |
| download | nixlib-e80302dc7dd9424860c118042707ed0f30fe2c2f.tar nixlib-e80302dc7dd9424860c118042707ed0f30fe2c2f.tar.gz nixlib-e80302dc7dd9424860c118042707ed0f30fe2c2f.tar.bz2 nixlib-e80302dc7dd9424860c118042707ed0f30fe2c2f.tar.lz nixlib-e80302dc7dd9424860c118042707ed0f30fe2c2f.tar.xz nixlib-e80302dc7dd9424860c118042707ed0f30fe2c2f.tar.zst nixlib-e80302dc7dd9424860c118042707ed0f30fe2c2f.zip | |
Merge pull request #86142 from bcdarwin/itk-5.1.0
Itk: 5.0.1 -> 5.1.0
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a05fec52b7c..661bc75daaa4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12304,7 +12304,7 @@ in itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; itk = callPackage ../development/libraries/itk { - stdenv = gcc8Stdenv; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; jasper = callPackage ../development/libraries/jasper { }; @@ -14438,7 +14438,10 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + simpleitk = callPackage ../development/libraries/simpleitk { + lua = lua51Packages.lua; + stdenv = gcc8Stdenv; + }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; @@ -14869,7 +14872,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 @@ -24354,7 +24357,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { }; + ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; exonerate = callPackage ../applications/science/biology/exonerate { }; |