jbake: cleanup

1 files changed, 19 insertions, 20 deletions

diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 5bc649ece86de..9762926ddf5ec 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -1,27 +1,26 @@
-{stdenv, fetchurl, unzip, jre, ...}:
+{ stdenv, fetchzip, jre }:
 
 stdenv.mkDerivation rec {
-    version = "2.5.1";
-    name = "jbake-${version}";
-    src = fetchurl {
-        url = "http://jbake.org/files/jbake-${version}-bin.zip";
-        sha256="1r46y84q5x915055hx2vxydaqng3cz0clwz0yhwapgmi4sliygjd";
-    };
+  version = "2.5.1";
+  name = "jbake-${version}";
 
-    buildInputs = [ unzip jre ];
+  src = fetchzip {
+    url = "http://jbake.org/files/jbake-${version}-bin.zip";
+    sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912";
+  };
 
-    unpackPhase = "unzip ${src}";
+  buildInputs = [ jre ];
 
-    installPhase = ''
-        substituteInPlace $name/bin/jbake --replace "java" "${jre}/bin/java" 
-        mkdir -p $out
-        cp -r $name/* $out
-    '';
+  installPhase = ''
+    substituteInPlace bin/jbake --replace "java" "${jre}/bin/java" 
+    mkdir -p $out
+    cp -vr * $out
+  '';
 
-    meta = with stdenv; {
-        description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
-        homepage = "http://jbake.org/";
-        license = lib.licenses.mit;
-        maintainers = with lib.maintainers; [moaxcp];
-    };
+  meta = with stdenv.lib; {
+    description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
+    homepage = "http://jbake.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ moaxcp ];
+  };
 }