iprover: reimplement using mkDerivation

1 files changed, 19 insertions, 41 deletions

diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index e03b33fa43cc..fe906fbe3578 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -1,35 +1,19 @@
-x@{builderDefsPackage
-  , ocaml, eprover
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, ocaml, eprover }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="iprover";
-    version="0.8.1";
-    name="${baseName}_v${version}";
-    url="http://${baseName}.googlecode.com/files/${name}.tar.gz";
-    hash="15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "iprover-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "http://iprover.googlecode.com/files/iprover_v${version}.tar.gz";
+    sha256 = "15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
   };
 
-  name = "${sourceInfo.baseName}-${sourceInfo.version}";
-  inherit buildInputs;
+  buildInputs = [ ocaml eprover ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMake" "doDeploy"];
-  configureCommand = "sh configure";
-  doDeploy = a.fullDepEntry (''
+  preConfigure = ''patchShebangs .'';
+
+  installPhase = ''
     mkdir -p "$out/bin"
     cp iproveropt "$out/bin"
 
@@ -37,22 +21,16 @@ rec {
     cp *.p "$out/share/${name}"
     echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
     chmod a+x  "$out"/bin/iprover
-  '') ["defEnsureDir" "minInit" "doMake"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An automated first-order logic theorem prover";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers;
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = with a.lib.licenses;
-      gpl3;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://code.google.com/p/iprover/downloads/list";
-    };
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    downloadPage = "http://code.google.com/p/iprover/downloads/list";
   };
-}) x
+}