martyr: fixed build, removed build.sh, added meta (see #23253)

NixOS · Mar 20, 2017 · 4bfde8f · 4bfde8f
1 parent 8c0074d
commit 4bfde8f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/pkgs/development/libraries/martyr/builder.sh b/pkgs/development/libraries/martyr/builder.sh
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
@@ -1,11 +1,24 @@
-{stdenv, fetchurl, apacheAnt}:
+{stdenv, fetchurl, ant, jdk}:
 
-stdenv.mkDerivation {
-	name = "martyr-0.3.9";
-	builder = ./builder.sh;
+stdenv.mkDerivation rec {
+	name = "martyr-${version}";
+  version = "0.3.9";
 	src = fetchurl {
-		url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz";
+		url = "mirror://sourceforge/martyr/${name}.tar.gz";
 		sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
 	};
-	inherit stdenv apacheAnt;
+
+  buildInputs = [ ant jdk ];
+
+  buildPhase = "ant";
+
+  installPhase = ''
+    mkdir -p "$out/share/java"
+    cp -v *.jar "$out/share/java"
+  '';
+
+  meta = {
+    description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
+    homepage = http://martyr.sourceforge.net/;
+  };
 }