diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-07-09 08:21:21 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-07-09 08:21:21 +0100 |
| commit | 223c91d03253890b59c56dfb1363c0f968d41f69 (patch) | |
| tree | 10d7d80ea0f8749ffa6354456ee703b89277cc27 /pkgs/applications/science/logic/cryptominisat | |
| parent | e3d703bb921c482add5d6bd633990a00b729ccc0 (diff) | |
| download | nixpkgs-223c91d03253890b59c56dfb1363c0f968d41f69.tar nixpkgs-223c91d03253890b59c56dfb1363c0f968d41f69.tar.gz nixpkgs-223c91d03253890b59c56dfb1363c0f968d41f69.tar.bz2 nixpkgs-223c91d03253890b59c56dfb1363c0f968d41f69.tar.lz nixpkgs-223c91d03253890b59c56dfb1363c0f968d41f69.tar.xz nixpkgs-223c91d03253890b59c56dfb1363c0f968d41f69.tar.zst nixpkgs-223c91d03253890b59c56dfb1363c0f968d41f69.zip | |
cryptominisat: use fetchpatch
Diffstat (limited to 'pkgs/applications/science/logic/cryptominisat')
| -rw-r--r-- | pkgs/applications/science/logic/cryptominisat/0001-fix-build-on-Nix-macOS.patch | 29 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/cryptominisat/default.nix | 10 |
2 files changed, 8 insertions, 31 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 deleted file mode 100644 index cbc30f83270..00000000000 --- a/pkgs/applications/science/logic/cryptominisat/0001-fix-build-on-Nix-macOS.patch +++ /dev/null @@ -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) - diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index d801d3fb896..ddbb140c9ba 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -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 ]; |