* Updated some more packages. However, bittorrent and vlc don't work

right now because wxGTK is broken (it depends on internal symbols in
  GTK which where made private in GTK 2.4).

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

pkgs/applications/video/vlc/builder.sh

@@ -1,11 +0,0 @@
-buildinputs="$x11 $wxGTK $libdvdcss $libdvdread $libdvdplay $mpeg2dec $a52dec $libmad $alsa"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd vlc-* || exit 1
-./configure --prefix=$out \
- --disable-ffmpeg \
- --enable-alsa \
- || exit 1
-make || exit 1
-make install || exit 1

pkgs/applications/video/vlc/default.nix

@@ -7,21 +7,17 @@ assert x11 != null && wxGTK != null && libdvdcss != null
 assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
 
 stdenv.mkDerivation {
-  name = "vlc-0.7.0";
+  name = "vlc-0.7.1";
 
-  builder = ./builder.sh;
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/0.7.0/vlc-0.7.0.tar.gz;
-    md5 = "05efef68528892ca933585c7db0842e3";
+    url = http://download.videolan.org/pub/videolan/vlc/0.7.1/vlc-0.7.1.tar.gz;
+    md5 = "faa5e3162a3e9b3a3d8c3dcc06f70911";
   };
 
-  x11 = x11;
-  wxGTK = wxGTK;
-  libdvdcss = libdvdcss;
-  libdvdplay = libdvdplay;
-  libdvdread = libdvdplay.libdvdread;
-  mpeg2dec = mpeg2dec;
-  a52dec = a52dec;
-  libmad = libmad;
-  alsa = alsa;
+  buildInputs = [
+    x11 wxGTK libdvdcss libdvdplay libdvdplay.libdvdread
+    mpeg2dec a52dec libmad alsa
+  ];
+
+  configureFlags = "--disable-ffmpeg --enable-alsa";
 }

pkgs/development/libraries/a52dec/builder.sh

@@ -1,8 +0,0 @@
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd a52dec-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/a52dec/default.nix

@@ -1,6 +1,7 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
   name = "a52dec-0.7.4";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz;
     md5 = "caa9f5bc44232dc8aeea773fea56be80";

pkgs/development/libraries/libdvdcss/builder.sh

@@ -1,8 +0,0 @@
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd libdvdcss-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/libdvdcss/default.nix

@@ -1,6 +1,7 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
   name = "libdvdcss-1.2.8";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdcss-1.2.8.tar.gz;
     md5 = "e35e4240b6ca0b66a0218065dffe6adb";

pkgs/development/libraries/libdvdplay/builder.sh

@@ -1,9 +0,0 @@
-buildinputs="$libdvdread"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd libdvdplay-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/libdvdplay/default.nix

@@ -4,10 +4,10 @@ assert libdvdread != null;
 
 stdenv.mkDerivation {
   name = "libdvdplay-1.0.1";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://www.videolan.org/pub/libdvdplay/1.0.1/libdvdplay-1.0.1.tar.bz2;
     md5 = "602bca4ef78d79aa87e5e8920d958a78";
   };
-  libdvdread = libdvdread;
+  buildInputs = [libdvdread];
+  inherit libdvdread;
 }

pkgs/development/libraries/libdvdread/builder.sh

@@ -1,9 +1,5 @@
-buildinputs="$libdvdcss"
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar xvfj $src || exit 1
-cd libdvdread-* || exit 1
-./configure --prefix=$out --with-libdvdcss="$libdvdcss" || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
+configureFlags="--with-libdvdcss=$libdvdcss"
+
+genericBuild

pkgs/development/libraries/libdvdread/default.nix

@@ -9,5 +9,6 @@ stdenv.mkDerivation {
     url = http://www.videolan.org/pub/videolan/vlc/0.6.2/contrib/libdvdread-20030812.tar.bz2;
     md5 = "9d58beac7c2dfb98d00f4ed0ea3d7274";
   };
-  libdvdcss = libdvdcss;
+  buildInputs = libdvdcss;
+  inherit libdvdcss;
 }

pkgs/development/libraries/libmad/builder.sh

@@ -1,8 +0,0 @@
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd libmad-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/libmad/default.nix

@@ -1,6 +1,7 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
   name = "libmad-0.15.0b";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/mad/libmad-0.15.0b.tar.gz;
     md5 = "2e4487cdf922a6da2546bad74f643205";

pkgs/development/libraries/mpeg2dec/builder.sh

@@ -1,8 +0,0 @@
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd mpeg2dec-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1

pkgs/development/libraries/mpeg2dec/default.nix

@@ -1,8 +1,9 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "mpeg2dec-20030612";
-  builder = ./builder.sh;
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "mpeg2dec-0.4.0b";
   src = fetchurl {
-    url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0.tar.gz;
-    md5 = "49a70fef1b0f710ed7e64ed32ee82d4d";
+    url = http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz;
+    md5 = "52d10ea80595ec83d8557ba7ac6dc8e6";
   };
 }

pkgs/development/libraries/wxGTK/builder.sh

@@ -1,13 +0,0 @@
-buildinputs="$pkgconfig $gtk $libtiff $libjpeg $libpng $zlib"
-. $stdenv/setup
-
-extraflags=
-if test -z "$compat22"; then
-  extraflags="--disable-compat22 $extraflags"
-fi
-
-tar xvfj $src
-cd wxGTK-*
-./configure --prefix=$out --enable-gtk2 $extraflags
-make
-make install

pkgs/development/libraries/wxGTK/default.nix

@@ -9,15 +9,17 @@ assert gtk.libpng.zlib != null;
 stdenv.mkDerivation {
   name = "wxGTK-2.4.2";
 
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/wxGTK-2.4.2.tar.bz2;
     md5 = "cdadfe82fc93f8a65a2ae18a95b0b0e3";
   };
 
-  libtiff = gtk.libtiff;
-  libjpeg = gtk.libjpeg;
-  libpng = gtk.libpng;
-  zlib = gtk.libpng.zlib;
-  inherit pkgconfig gtk compat22;
+  buildinputs = [pkgconfig gtk gtk.libtiff gtk.libjpeg gtk.libpng gtk.libpng.zlib];
+
+  configureFlags = [
+    "--enable-gtk2"
+    (if compat22 then "--enable-compat22" else "--disable-compat22")
+  ];
+
+  inherit gtk compat22;
 }

pkgs/development/python-modules/wxPython/builder.sh

@@ -1,6 +1,20 @@
-buildinputs="$wxGTK $python $pkgconfig $gtk"
 . $stdenv/setup
 
-tar xvfz $src
-cd wxPythonSrc-*/wxPython
-python setup.py WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0 build install --prefix=$out
+flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0"
+
+configurePhase() {
+    cd wxPython
+}
+configurePhase=configurePhase
+
+buildPhase() {
+    python setup.py $flags build
+}
+buildPhase=buildPhase
+
+installPhase() {
+    python setup.py $flags install --prefix=$out
+}
+installPhase=installPhase
+
+genericBuild

pkgs/development/python-modules/wxPython/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, wxGTK, python}:
+{stdenv, fetchurl, pkgconfig, wxGTK, python}:
 
 assert wxGTK.compat22;
 
@@ -9,7 +9,6 @@ stdenv.mkDerivation {
     url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.2.4.tar.gz;
     md5 = "ea4eb68e10a0c2a9be643b35dcb78e41";
   };
-  pkgconfig = wxGTK.pkgconfig;
-  gtk = wxGTK.gtk;
-  inherit wxGTK python;
-}
+  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
+  inherit wxGTK; # !!! move this down
+} // { inherit python; } 

pkgs/os-specific/linux/alsa/library/builder.sh

@@ -1,7 +0,0 @@
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd alsa-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs/os-specific/linux/alsa/library/default.nix

@@ -1,8 +1,9 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "alsa-lib-0.9.8";
-  builder = ./builder.sh;
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "alsa-lib-1.0.3b";
   src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-0.9.8.tar.bz2;
-    md5 = "c9f163fb0623de1b92bf287712641f6e";
+    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.3b.tar.bz2;
+    md5 = "8ade68f0e9d44a039a741052985a8635";
   };
 }

pkgs/system/all-packages-generic.nix

@@ -479,11 +479,7 @@ rec {
   };
 
   wxGTK = (import ../development/libraries/wxGTK) {
-    inherit fetchurl stdenv;
-    fetchurl = fetchurl;
-    stdenv = stdenv;
-    pkgconfig = pkgconfig;
-    gtk = gtk;
+    inherit fetchurl stdenv pkgconfig gtk;
   };
 
   gnet = (import ../development/libraries/gnet) {
@@ -605,7 +601,7 @@ rec {
   };
 
   wxPython = (import ../development/python-modules/wxPython) {
-    inherit fetchurl stdenv wxGTK python;
+    inherit fetchurl stdenv pkgconfig wxGTK python;
   };
 
 

pkgs/system/populate-cache.nix

@@ -45,7 +45,7 @@ let {
       pkgs.MPlayer
       pkgs.MPlayerPlugin
 #      pkgs.vlc
-      pkgs.zapping
+#      pkgs.zapping
       pkgs.gqview
       pkgs.hello
       pkgs.nxml