cryptominisat: use fetchpatch

This commit is contained in:
Jörg Thalheim 2020-07-09 08:21:21 +01:00
parent e3d703bb92
commit 223c91d032
2 changed files with 8 additions and 31 deletions

View file

@ -1,29 +0,0 @@
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)

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, python3, xxd, boost }:
{ stdenv, fetchFromGitHub, cmake, python3, xxd, boost, fetchpatch }:
stdenv.mkDerivation rec {
pname = "cryptominisat";
@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50";
};
patches = [ ./0001-fix-build-on-Nix-macOS.patch ];
patches = [
(fetchpatch {
# https://github.com/msoos/cryptominisat/pull/621
url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch";
sha256 = "0hdy345bwcbxz0jl1jdxfa6mmfh77s2pz9rnncsr0jzk11b3j0cw";
})
];
buildInputs = [ python3 boost ];
nativeBuildInputs = [ cmake xxd ];