Unverified Commit 9d13dbb1 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

gdcm, or-tools: improve darwin build
parents 57411e26 ee1454fc

pkgs/development/libraries/gdcm/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

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

+3 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -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;