diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/applications/science/logic/boolector/default.nix | |
parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/applications/science/logic/boolector/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/science/logic/boolector/default.nix | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/applications/science/logic/boolector/default.nix b/nixpkgs/pkgs/applications/science/logic/boolector/default.nix index 105e911ed4fd..aedc8e3484a9 100644 --- a/nixpkgs/pkgs/applications/science/logic/boolector/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/boolector/default.nix @@ -1,37 +1,31 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, cmake, lingeling, btor2tools +{ stdenv, fetchFromGitHub, lib, python3 +, cmake, lingeling, btor2tools, gtest, gmp }: stdenv.mkDerivation rec { pname = "boolector"; - version = "3.0.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "boolector"; repo = "boolector"; rev = "refs/tags/${version}"; - sha256 = "15i3ni5klss423m57wcy1gx0m5wfrjmglapwg85pm7fb3jj1y7sz"; + sha256 = "0jkmaw678njqgkflzj9g374yk1mci8yqvsxkrqzlifn6bwhwb7ci"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-7560.patch"; - url = "https://github.com/Boolector/boolector/commit/8d979d02e0482c7137c9f3a34e6d430dbfd1f5c5.patch"; - sha256 = "1a1g02mk8b0azzjcigdn5zpshn0dn05fciwi8sd5q38yxvnvpbbi"; - }) - ]; + postPatch = '' + sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 + ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ lingeling btor2tools ]; + buildInputs = [ lingeling btor2tools gmp ]; cmakeFlags = - [ "-DSHARED=ON" + [ "-DBUILD_SHARED_LIBS=ON" "-DUSE_LINGELING=YES" - "-DBTOR2_INCLUDE_DIR=${btor2tools.dev}/include" - "-DBTOR2_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so" - "-DLINGELING_INCLUDE_DIR=${lingeling.dev}/include" - "-DLINGELING_LIBRARIES=${lingeling.lib}/lib/liblgl.a" - ]; + "-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include" + "-DBtor2Tools_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so" + ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); installPhase = '' mkdir -p $out/bin $lib/lib $dev/include @@ -39,13 +33,22 @@ stdenv.mkDerivation rec { cp -vr bin/* $out/bin cp -vr lib/* $lib/lib - rm -rf $out/bin/{examples,test} + rm -rf $out/bin/{examples,tests} + # we don't care about gtest related libs + rm -rf $lib/lib/libg* cd ../src find . -iname '*.h' -exec cp --parents '{}' $dev/include \; rm -rf $dev/include/tests ''; + checkInputs = [ python3 ]; + doCheck = true; + preCheck = '' + export LD_LIBRARY_PATH=$(readlink -f lib) + patchShebangs .. + ''; + outputs = [ "out" "dev" "lib" ]; meta = with stdenv.lib; { |