From fe9133d52221275a7f91cb7efafeb6ebee6129a0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 10 Jun 2014 16:38:45 -0500
Subject: [PATCH] verifast: 14.5, x86_64 linux only

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/verifast/default.nix        | 24 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index a2959892ddb..7ab08cf8799 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -5,43 +5,39 @@ let
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo
       freetype fontconfig libxml2 gnome2.gtksourceview
-    ];
+    ] + ":${stdenv.gcc.gcc}/lib64";
 
-  patchLib = x: extra: "patchelf --set-rpath ${libPath}:${extra} ${x}";
-  patchExe = x: extra: ''
+  patchExe = x: ''
     patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath}:${extra} ${x}
+      --set-rpath ${libPath} ${x}
   '';
 in
 stdenv.mkDerivation rec {
   name    = "verifast-${version}";
-  version = "13.11.14";
+  version = "14.5";
 
   src = fetchurl {
-    url    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/verifast-13.11.14.tar.gz";
-    sha256 = "1ahay7achjsfz59d3b6vl1v91gr5j34vb494isqw3fsw5l8jd9p7";
+    url    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/${name}-x64.tar.gz";
+    sha256 = "03y1s6s2j9vqgiad0vbxriipsypxaylxxd3q36n9rvrc3lf9xra9";
   };
 
   dontStrip = true;
+  phases = "unpackPhase installPhase";
   installPhase = ''
     mkdir -p $out/bin
     cp -R bin $out/libexec
 
-    ${patchLib "$out/libexec/libz3-gmp.so"  "$out/libexec"}
-    ${patchExe "$out/libexec/vfide-core"    "$out/libexec"}
-    ${patchExe "$out/libexec/verifast-core" "$out/libexec"}
-
+    ${patchExe "$out/libexec/verifast-core"}
+    ${patchExe "$out/libexec/vfide-core"}
     ln -s $out/libexec/verifast-core $out/bin/verifast
     ln -s $out/libexec/vfide-core    $out/bin/vfide
   '';
 
-  phases = "unpackPhase installPhase";
-
   meta = {
     description = "Verification for C and Java programs via separation logic";
     homepage    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/";
     license     = stdenv.lib.licenses.msrla;
-    platforms   = [ "i686-linux" ];
+    platforms   = [ "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f03e981075..11cd21673d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10657,7 +10657,7 @@ let
 
   tptp = callPackage ../applications/science/logic/tptp {};
 
-  verifast = callPackage_i686 ../applications/science/logic/verifast {};
+  verifast = callPackage ../applications/science/logic/verifast {};
 
   why3 = callPackage ../applications/science/logic/why3 {};