From 3701ba7f411883668576081ddae4e81bef641200 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 24 Nov 2024 20:26:11 +0100 Subject: [PATCH] gdcm: switch to new sdk pattern on darwin --- pkgs/development/libraries/gdcm/default.nix | 11 +++-------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index ca099da0235457..71ff522ceb3ea4 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -4,10 +4,7 @@ , cmake , enableVTK ? true , vtk -, ApplicationServices -, Cocoa , DarwinTools # sw_vers -, libiconv , enablePython ? false , python ? null , swig @@ -16,6 +13,7 @@ , openjpeg , zlib , pkg-config +, apple-sdk_15 }: stdenv.mkDerivation rec { @@ -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 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7543000e796118..bcd5179525151f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };