* Add cdrkit instead of cdrtools to the channel.

svn path=/nixpkgs/trunk/; revision=9484

pkgs/applications/misc/cdrkit/default.nix

@@ -1,4 +1,5 @@
 {stdenv, fetchurl, cmake, libcap, zlib}:
+
 stdenv.mkDerivation {
   name = "cdrkit-1.1.6";
 
@@ -12,8 +13,8 @@ stdenv.mkDerivation {
   makeFlags = "PREFIX=\$(out)";
 
   meta = {
-    description = "
-CD and DVD writing kit, mostly compatible with cdrtools.
-";
+    description = "Portable command-line CD/DVD recorder software, mostly compatible with cdrtools";
+    homepage = http://cdrkit.org/;
+    license = "GPL2";
   };
 }

pkgs/applications/misc/cdrtools/default.nix

@@ -8,4 +8,9 @@ stdenv.mkDerivation {
     md5 = "d44a81460e97ae02931c31188fe8d3fd";
   };
   patches = [./cdrtools-2.01-install.patch];
+
+  meta = {
+    description = "Highly portable CD/DVD/BluRay command line recording software (deprecated; use cdrkit instead)";
+    homepage = http://cdrecord.berlios.de/old/private/cdrecord.html;
+  };
 }

pkgs/top-level/build-for-release.nix

@@ -24,7 +24,7 @@ let {
     bsdiff
     bzip2
     cabextract
-    cdrtools
+    cdrkit
     chatzilla
     cksfv
     compiz