nixpkgs: yices 2.2.1 -> 2.3.1, now with source

It's still under a non-commercial license, but the source build is waay
better than the binary build. Can probably work on OS X too now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>

1 files changed, 11 insertions, 28 deletions

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 4e3b9b2a76b..5daaa444c12 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,36 +1,19 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, gmp, gperf, autoreconfHook }:
 
-assert stdenv.isLinux;
-
-let
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-in
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
-  version = "2.2.1";
-
-  src =
-    if stdenv.system == "i686-linux"
-    then fetchurl {
-      url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-i686-pc-linux-gnu-static-gmp.tar.gz&accept=I+accept";
-      name = "yices-${version}-i686.tar.gz";
-      sha256 = "12jzk3kqlbqa5x6rl92cpzj7dch7gm7fnbj72wifvwgdj4zyhrra";
-    }
-    else fetchurl {
-      url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-x86_64-unknown-linux-gnu-static-gmp.tar.gz&accept=I+accept";
-      name = "yices-${version}-x86_64.tar.gz";
-      sha256 = "0fpmihf6ykcg4qbsimkamgcwp4sl1xyxmz7q28ily91rd905ijaj";
-    };
+  version = "2.3.1";
 
-  buildPhase = false;
-  installPhase = ''
-    mkdir -p $out/bin $out/lib $out/include
-    cd bin     && mv * $out/bin     && cd ..
-    cd lib     && mv * $out/lib     && cd ..
-    cd include && mv * $out/include && cd ..
+  src = fetchurl {
+    url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-2.3.1-src.tar.gz&accept=I+Agree";
+    name = "yices-${version}-src.tar.gz";
+    sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
+  };
 
-    patchelf --set-rpath ${libPath} $out/lib/libyices.so.${version}
-  '';
+  configureFlags = [ "--with-static-gmp=${gmp}/lib/libgmp.a"
+                     "--with-static-gmp-include-dir=${gmp}/include"
+                   ];
+  buildInputs = [ gmp gperf autoreconfHook ];
 
   meta = {
     description = "A high-performance theorem prover and SMT solver";