Skip to content

Commit

Permalink
gdcm: switch to new sdk pattern on darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
tricktron committed Nov 24, 2024
1 parent 2d7c550 commit 3701ba7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
11 changes: 3 additions & 8 deletions pkgs/development/libraries/gdcm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
, cmake
, enableVTK ? true
, vtk
, ApplicationServices
, Cocoa
, DarwinTools # sw_vers
, libiconv
, enablePython ? false
, python ? null
, swig
Expand All @@ -16,6 +13,7 @@
, openjpeg
, zlib
, pkg-config
, apple-sdk_15
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -60,11 +58,8 @@ stdenv.mkDerivation rec {
zlib
] ++ lib.optionals enableVTK [
vtk
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
ApplicationServices
Cocoa
libiconv
] ++ lib.optionals enablePython [ swig python ];
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]
++ lib.optionals enablePython [ swig python ];

postInstall = lib.optionalString enablePython ''
substitute \
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9253,7 +9253,6 @@ with pkgs;

gdcm = callPackage ../development/libraries/gdcm {
inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
};

givaro = callPackage ../development/libraries/givaro { };
Expand Down

0 comments on commit 3701ba7

Please sign in to comment.