nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-09 13:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #317930 from afh/improve-gdcm-ortools-darwin-build

Browse Source 
gdcm, or-tools: improve darwin build
This commit is contained in:
Weijia Wang 2024-06-08 22:04:08 +02:00 committed by GitHub
commit 9d13dbb1ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

3
pkgs/development/libraries/science/math/or-tools/default.nix
View File

@ -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

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

@ -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;