From 2c9bea0eaadaf8e3c17afac89ae53154e37016da Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 27 May 2023 16:52:52 +0100 Subject: [PATCH] sharpsat-td: patch with updated version of mpreal/mpfrc++ this version is needed for mpfr 4.2.0+ support lesson - don't merge old PRs without re-testing them yourself --- .../science/logic/sharpsat-td/default.nix | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/sharpsat-td/default.nix b/pkgs/applications/science/logic/sharpsat-td/default.nix index de9e212d8cc8..2f2128d542f1 100644 --- a/pkgs/applications/science/logic/sharpsat-td/default.nix +++ b/pkgs/applications/science/logic/sharpsat-td/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, gmp, mpfr }: +{ lib +, stdenv +, fetchFromGitHub +, fetchzip +, cmake +, gmp +, mpfr +}: let satlib-bmc = fetchzip { @@ -7,6 +14,14 @@ let sha256 = "sha256-F1Jfrj4iMMf/3LFCShIDMs4JfLkJ51Z4wkL1FDT9b/A="; }; + # needed for mpfr 4.2.0+ support + mpreal = fetchFromGitHub { + owner = "advanpix"; + repo = "mpreal"; + rev = "mpfrc++-3.6.9"; + sha256 = "sha256-l61SKEx4pBocADrEGPVacQ6F2ep9IuvNZ8W08dKeZKg="; + }; + in stdenv.mkDerivation rec { pname = "sharpsat-td"; version = "unstable-2021-09-05"; @@ -27,6 +42,10 @@ in stdenv.mkDerivation rec { --replace '"../../../flow-cutter-pace17/flow_cutter_pace17"' '"'"$out"'/bin/flow_cutter_pace17"' substituteInPlace src/preprocessor/treewidth.cpp \ --replace '"./flow_cutter_pace17"' '"'"$out"'/bin/flow_cutter_pace17"' + + # replace bundled version of mpreal/mpfrc++ + rm -r src/mpfr + cp -r ${mpreal} src/mpfr ''; nativeBuildInputs = [ cmake ];