* dvd+rw-tools updated to 7.1.

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

pkgs/os-specific/linux/dvd+rw-tools/7.0.nix

@@ -1,30 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz;
-			sha256 = "08hljn2vfn794dfrfpp3m245dbpb6nhk40igfpqm6wg9qimc9zy9";
-		};
-
-		buildInputs = [cdrkit m4];
-		configureFlags = [];
-		makeFlags = [" prefix=\$out "];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-let 
-	preBuild = FullDepEntry ("
-		sed -e '1i#define INT_MAX __INT_MAX__' -i *.c *.cpp
-		sed -e 's@/usr/local@'\$out'@g' -i Makefile.m4 Makefile
-	") [minInit doUnpack];
-in
-stdenv.mkDerivation rec {
-	name = "dvd+rw-tools-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [preBuild addInputs (doDump "0") doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-	DVD+RW tools.
-";
-		inherit src;
-	};
-}

pkgs/os-specific/linux/dvd+rw-tools/default.nix

@@ -0,0 +1,25 @@
+{stdenv, fetchurl, cdrkit, m4}:
+
+stdenv.mkDerivation {
+  name = "dvd+rw-tools-7.1";
+
+  src = fetchurl {
+    url = http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz;
+    sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq";
+  };
+
+  buildInputs = [cdrkit m4];
+
+  preBuild = ''
+    makeFlags="prefix=$out"
+  '';
+  
+  # Incompatibility with Linux 2.6.23 headers, see
+  # http://www.mail-archive.com/cdwrite@other.debian.org/msg11464.html
+  NIX_CFLAGS_COMPILE = "-DINT_MAX=__INT_MAX__";
+
+  meta = {
+    homepage = http://fy.chalmers.se/~appro/linux/DVD+RW/tools;
+    description = "Tools for burning DVDs";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -5879,13 +5879,10 @@ let pkgs = rec {
     inherit fetchurl stdenv qt4 djvulibre;
   };
 
-  /* TODO: rename to be able to set version */
+  dvdplusrwtools = import ../os-specific/linux/dvd+rw-tools {
-  dvdplusrwtoolsFun = lib.sumArgs (selectVersion ../os-specific/linux/dvd+rw-tools "7.0") {
+    inherit fetchurl stdenv cdrkit m4;
-    inherit fetchurl stdenv builderDefs cdrkit m4;
   };
 
-  dvdplusrwtools = dvdplusrwtoolsFun null;
-
   # building eclipise from source
   # experimental tested on x86_64-linux only
   eclipse_classic_src = import ../applications/editors/eclipse/eclipse_classic.nix {