summary refs log tree commit diff
path: root/pkgs/applications/science/logic/cryptominisat
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-07-09 08:11:28 +0100
committerJörg Thalheim <joerg@thalheim.io>2020-07-09 08:11:28 +0100
commite3d703bb921c482add5d6bd633990a00b729ccc0 (patch)
tree6a7c48aa2698ea5197a4cb6e651534907a4590d6 /pkgs/applications/science/logic/cryptominisat
parent3628d0d8938ddca22f5ca5f999eae321b6657329 (diff)
downloadnixpkgs-e3d703bb921c482add5d6bd633990a00b729ccc0.tar
nixpkgs-e3d703bb921c482add5d6bd633990a00b729ccc0.tar.gz
nixpkgs-e3d703bb921c482add5d6bd633990a00b729ccc0.tar.bz2
nixpkgs-e3d703bb921c482add5d6bd633990a00b729ccc0.tar.lz
nixpkgs-e3d703bb921c482add5d6bd633990a00b729ccc0.tar.xz
nixpkgs-e3d703bb921c482add5d6bd633990a00b729ccc0.tar.zst
nixpkgs-e3d703bb921c482add5d6bd633990a00b729ccc0.zip
cryptominisat: fix build on darwin
Diffstat (limited to 'pkgs/applications/science/logic/cryptominisat')
-rw-r--r--pkgs/applications/science/logic/cryptominisat/0001-fix-build-on-Nix-macOS.patch29
-rw-r--r--pkgs/applications/science/logic/cryptominisat/default.nix2
2 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/applications/science/logic/cryptominisat/0001-fix-build-on-Nix-macOS.patch b/pkgs/applications/science/logic/cryptominisat/0001-fix-build-on-Nix-macOS.patch
new file mode 100644
index 00000000000..cbc30f83270
--- /dev/null
+++ b/pkgs/applications/science/logic/cryptominisat/0001-fix-build-on-Nix-macOS.patch
@@ -0,0 +1,29 @@
+From b1bfa51c4032b4eedc61b536c852b6ff2a295f07 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Thu, 9 Jul 2020 08:08:25 +0100
+Subject: [PATCH] fix build on Nix/macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index f549ca7..5a23f25 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -77,7 +77,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+        ARGS setup.py build_ext --inplace
+        DEPENDS cryptominisat5
+    )
+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT DEFINED ENV{NIX_CC})
+     execute_process(COMMAND xcrun --show-sdk-path
+         OUTPUT_VARIABLE PY_OSX_SDK_PATH
+         OUTPUT_STRIP_TRAILING_WHITESPACE)
+-- 
+2.24.3 (Apple Git-128)
+
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index 20f266ec257..d801d3fb896 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50";
   };
 
+  patches = [ ./0001-fix-build-on-Nix-macOS.patch ];
+
   buildInputs = [ python3 boost ];
   nativeBuildInputs = [ cmake xxd ];