cd-discid: 0.9 -> 1.4

Also did some package cleanups and added myself as maintainer.

pkgs/applications/audio/cd-discid/default.nix

@@ -1,31 +1,27 @@
 { fetchurl, stdenv }:
 
-let version = "0.9";
+stdenv.mkDerivation rec {
-in
+  name = "cd-discid-${version}";
-  stdenv.mkDerivation {
+  version = "1.4";
-    name = "cd-discid-${version}";
-    src = fetchurl {
-      url = "mirror://debian/pool/main/c/cd-discid/cd-discid_${version}.orig.tar.gz";
-      sha256 = "1fx2ky1pb07l1r0bldpw16wdsfzw7a0093ib9v66kmilwy2sq5s9";
-    };
 
-    patches = [ ./install.patch ];
+  src = fetchurl {
+    url = "http://linukz.org/download/${name}.tar.gz";
+    sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
+  };
 
-    configurePhase = ''
+  installFlags = "PREFIX=$(out)";
-      sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
+
-	      s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g"  \
+  meta = with stdenv.lib; {
-	  "Makefile";
+    homepage = http://linukz.org/cd-discid.shtml;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.unix;
+    description = "command-line utility to get CDDB discid information from a CD-ROM disc";
+
+    longDescription = ''
+      cd-discid is a backend utility to get CDDB discid information
+      from a CD-ROM disc.  It was originally designed for cdgrab (now
+      abcde), but can be used for any purpose requiring CDDB data.
     '';
-
+  };
-    meta = {
+}
-      homepage = http://lly.org/~rcw/cd-discid/;
-      license = stdenv.lib.licenses.gpl2Plus;
-      description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID";
-
-      longDescription = ''
-        cd-discid is a backend utility to get CDDB discid information
-        from a CD-ROM disc.  It was originally designed for cdgrab (now
-        abcde), but can be used for any purpose requiring CDDB data.
-      '';
-    };
-  }

pkgs/applications/audio/cd-discid/install.patch

@@ -1,14 +0,0 @@
---- cd-discid-0.9/Makefile	2003-01-05 21:18:07.000000000 +0100
-+++ cd-discid-0.9/Makefile	2008-05-26 22:14:56.000000000 +0200
-@@ -32,9 +32,9 @@ clean:
- 
- install: cd-discid
- 	$(INSTALL) -d -m 755 $(bindir)
--	$(INSTALL) -s -m 755 -o 0 cd-discid $(bindir)
-+	$(INSTALL) -s -m 755 cd-discid $(bindir)
- 	$(INSTALL) -d -m 755 $(mandir)
--	$(INSTALL) -m 644 -o 0 cd-discid.1 $(mandir)
-+	$(INSTALL) -m 644 cd-discid.1 $(mandir)
- 
- tarball:
- 	@cd .. && tar czvf cd-discid_$(VERSION).orig.tar.gz \