diff options
-rw-r--r-- | pkgs/applications/science/logic/z3_opt/default.nix | 46 | ||||
-rw-r--r-- | pkgs/development/compilers/souper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 2 insertions, 49 deletions
diff --git a/pkgs/applications/science/logic/z3_opt/default.nix b/pkgs/applications/science/logic/z3_opt/default.nix deleted file mode 100644 index d3d63795d69bb..0000000000000 --- a/pkgs/applications/science/logic/z3_opt/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub, python2 }: - -# Copied shamelessly from the normal z3 .nix - -let - python = python2; -in stdenv.mkDerivation rec { - name = "z3_opt-${version}"; - version = "4.3.2"; - - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "9377779e5818b2ca15c4f39921b2ba3a42f948e7"; - sha256 = "15d6hsb61hrm5vy3l2gnkrfnqr68lvspnznm17vyhm61ld33yaff"; - }; - - buildInputs = [ python ]; - enableParallelBuilding = true; - - configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build"; - - # z3's install phase is stupid because it tries to calculate the - # python package store location itself, meaning it'll attempt to - # write files into the nix store, and fail. - soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so"; - installPhase = '' - mkdir -p $out/bin $out/${python.sitePackages} $out/include - cp ../src/api/z3*.h $out/include - cp ../src/api/c++/z3*.h $out/include - cp z3 $out/bin - cp libz3${soext} $out/lib - cp libz3${soext} $out/${python.sitePackages} - cp z3*.pyc $out/${python.sitePackages} - cp ../src/api/python/*.py $out/${python.sitePackages} - ''; - - meta = { - description = "A high-performance theorem prover and SMT solver, optimization edition"; - homepage = "https://github.com/Z3Prover/z3"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ]; - }; -} - diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix index 327139ce04557..2203dc980b132 100644 --- a/pkgs/development/compilers/souper/default.nix +++ b/pkgs/development/compilers/souper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper -, llvmPackages_4, hiredis, z3_opt, gtest +, llvmPackages_4, hiredis, z3, gtest }: let @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { cp -v ./souper $out/bin/ cp -v ./clang-souper $out/bin/ wrapProgram "$out/bin/souper" \ - --add-flags "-z3-path=\"${z3_opt}/bin/z3\"" + --add-flags "-z3-path=\"${z3}/bin/z3\"" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d25400b00017b..6bbba06b9eeb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18407,7 +18407,6 @@ with pkgs; }; z3 = callPackage ../applications/science/logic/z3 {}; - z3_opt = callPackage ../applications/science/logic/z3_opt {}; boolector = callPackage ../applications/science/logic/boolector {}; |