dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gdcm: switch to new sdk pattern on darwin and fixes build (#358792)

Browse Source
This commit is contained in:
Weijia Wang 2024-11-27 22:11:19 +01:00 committed by GitHub
commit 4a60dea06b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/gdcm/default.nix
View File

@ -4,10 +4,7 @@
, cmake , cmake
, enableVTK ? true , enableVTK ? true
, vtk , vtk
, ApplicationServices
, Cocoa
, DarwinTools # sw_vers , DarwinTools # sw_vers
, libiconv
, enablePython ? false , enablePython ? false
, python ? null , python ? null
, swig , swig
@ -60,10 +57,6 @@ stdenv.mkDerivation rec {
zlib zlib
] ++ lib.optionals enableVTK [ ] ++ lib.optionals enableVTK [
vtk vtk
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Cocoa
libiconv
] ++ lib.optionals enablePython [ swig python ]; ] ++ lib.optionals enablePython [ swig python ];
postInstall = lib.optionalString enablePython '' postInstall = lib.optionalString enablePython ''

1
pkgs/top-level/all-packages.nix
View File

@ -9235,7 +9235,6 @@ with pkgs;
gdcm = callPackage ../development/libraries/gdcm { gdcm = callPackage ../development/libraries/gdcm {
inherit (darwin) DarwinTools; inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
}; };
givaro = callPackage ../development/libraries/givaro { }; givaro = callPackage ../development/libraries/givaro { };