diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-06-08 22:04:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-08 22:04:08 +0200 |
| commit | 9d13dbb1ef2d0a6a6788d5b6fe4cbd727dd893c5 (patch) | |
| tree | d7acb5a7536f36437322c08d084d36bfe6f16b0d | |
| parent | 57411e2649a33719d991b647eed34b63e1d76c3c (diff) | |
| parent | ee1454fc7d6a55c27366bc050444519a7e561f0a (diff) | |
Merge pull request #317930 from afh/improve-gdcm-ortools-darwin-build
gdcm, or-tools: improve darwin build
| -rw-r--r-- | pkgs/development/libraries/gdcm/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/math/or-tools/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 18058af21cb1d..84e0686d5937d 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -6,6 +6,7 @@ , vtk , ApplicationServices , Cocoa +, DarwinTools # sw_vers , libiconv , enablePython ? false , python ? null @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ]; + ] ++ lib.optional stdenv.isDarwin DarwinTools; buildInputs = [ expat diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 1b17f95761752..acb0ece75463c 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -2,6 +2,7 @@ , bzip2 , cbc , cmake +, DarwinTools # sw_vers , eigen , ensureNewerSourcesForZipFilesHook , fetchFromGitHub @@ -72,6 +73,8 @@ stdenv.mkDerivation rec { python.pythonOnBuildForHost swig4 unzip + ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools ] ++ (with python.pythonOnBuildForHost.pkgs; [ pip mypy-protobuf diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adb14fb5f32cc..9db723f0fdbcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20902,6 +20902,7 @@ with pkgs; }; gdcm = callPackage ../development/libraries/gdcm { + inherit (darwin) DarwinTools; inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; @@ -38182,6 +38183,7 @@ with pkgs; osi = callPackage ../development/libraries/science/math/osi { }; or-tools = callPackage ../development/libraries/science/math/or-tools { + inherit (darwin) DarwinTools; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; protobuf = protobuf_21; |