From a9f7dd99638c82035ac3703256cca1a336f0def0 Mon Sep 17 00:00:00 2001 From: stevan Date: Mon, 14 Nov 2022 00:35:24 -0600 Subject: [PATCH 1/2] or-tools: add darwin support --- pkgs/development/libraries/science/math/or-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 30feab0c9bf6..c003872603a0 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "-DFETCH_PYTHON_DEPS=OFF" "-DUSE_GLPK=ON" "-DUSE_SCIP=OFF" - ]; + ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ]; nativeBuildInputs = [ cmake ensureNewerSourcesForZipFilesHook @@ -104,6 +104,6 @@ stdenv.mkDerivation rec { Google's software suite for combinatorial optimization. ''; maintainers = with maintainers; [ andersk ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } From 1de4691d3cfde7210b939391ac65ff1bbd0fbde2 Mon Sep 17 00:00:00 2001 From: stevan Date: Mon, 20 Mar 2023 19:35:54 -0500 Subject: [PATCH 2/2] or-tools: fix checkPhase issues --- .../development/libraries/science/math/or-tools/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index c003872603a0..c8d5ec74a6d0 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { url = "https://github.com/google/or-tools/commit/a26602f24781e7bfcc39612568aa9f4010bb9736.patch"; hash = "sha256-gM0rW0xRXMYaCwltPK0ih5mdo3HtX6mKltJDHe4gbLc="; }) + # Backport fix in cmake test configuration where pip installs newer version from PyPi over local build, + # breaking checkPhase: https://github.com/google/or-tools/issues/3260 + (fetchpatch { + url = "https://github.com/google/or-tools/commit/edd1544375bd55f79168db315151a48faa548fa0.patch"; + hash = "sha256-S//1YM3IoRCp3Ghg8zMF0XXgIpVmaw4gH8cVb9eUbqM="; + }) ]; cmakeFlags = [