-

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823

pkgs/applications/misc/xterm/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libXaw, xproto, libXt, libX11, libSM, libICE, ncurses}:
+args: with args;
 
 stdenv.mkDerivation rec {
   name = "xterm-231";
@@ -6,8 +6,11 @@ stdenv.mkDerivation rec {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
     sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr";
   };
-  buildInputs = [libXaw xproto libXt libX11 libSM libICE ncurses];
-  configureFlags = ["--enable-wide-chars"];
+  buildInputs = [libXaw xproto libXt libXext libX11 libSM libICE ncurses
+    freetype pkgconfig libXft luit];
+  configureFlags = "--enable-wide-chars --enable-256-color
+    --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
+    --enable-mini-luit";
 
   meta = {
     homepage = http://invisible-island.net/xterm;

pkgs/development/libraries/gettext/0.17.nix

@@ -0,0 +1,9 @@
+args: with args;
+stdenv.mkDerivation rec {
+  name = "gettext-" + version;
+  src = fetchurl {
+    url = "mirror://gnu/gettext/${name}.tar.gz";
+    sha256 = "1fipjpaxxwifdw6cbr7mkxp1yvy643i38nhlh7124bqnisxki5i0";
+  };
+  configureFlags = "--disable-csharp --enable-shared --disable-static";
+}

pkgs/development/libraries/gstreamer/default.nix

@@ -0,0 +1,13 @@
+args: with args;
+rec {
+  gstreamerFun = lib.sumArgs (selectVersion ./gstreamer "0.10.17") args;
+  gstreamer = gstreamerFun null;
+
+  gstPluginsBaseFun = lib.sumArgs (selectVersion ./gst-plugins-base "0.10.17")
+    args { inherit gstreamer; };
+  gstPluginsBase = gstPluginsBaseFun null;
+
+  gstPluginsGoodFun = lib.sumArgs (selectVersion ./gst-plugins-good "0.10.6")
+    args { inherit gstPluginsBase; };
+  gstPluginsGood = gstPluginsGoodFun null;
+}

pkgs/development/libraries/gstreamer/gst-plugins-base/0.10.17.nix

@@ -0,0 +1,24 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-base-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2";
+    sha256 = "03gpfhdaw7yz83y0wpq966b9dqpvw8v5kpixa1pp4mn7d5bgsb7q";
+  };
+
+  patchPhase = "sed -i 's@/bin/echo@echo@g' configure";
+
+  configureFlags = "--enable-shared --disable-static";
+
+# TODO : v4l, libvisual
+  propagatedBuildInputs = [gstreamer libX11 libXv libXext alsaLib cdparanoia
+    gnomevfs libogg libtheora libvorbis freetype pango liboil gtk];
+
+  buildInputs = [pkgconfig python];
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}

pkgs/development/libraries/gstreamer/gst-plugins-good/0.10.6.nix

@@ -0,0 +1,23 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "gst-plugins-good-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.bz2";
+    sha256 = "0rid0gjj8nsk0r5yn4bz1xfsbp446r92wc6wp4099hilw6jxd74y";
+  };
+
+  propagatedBuildInputs = [gstPluginsBase aalib cairo flac hal libjpeg
+    zlib speex libpng libdv libcaca dbus.libs libiec61883 libavc1394 ladspaH
+    taglib ];
+  buildInputs = [pkgconfig];
+
+  configureFlags = "--enable-shared --disable-static --enable-ladspa";
+
+  patches = [ ./tag_defines.patch ];
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}

pkgs/development/libraries/gstreamer/gst-plugins-good/tag_defines.patch

@@ -0,0 +1,22 @@
+diff -Nur gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc
+--- gst-plugins-good0.10-0.10.6/ext/taglib/gstid3v2mux.cc	2007-06-13 11:21:10.000000000 +0200
++++ gst-plugins-good0.10-0.10.6.new/ext/taglib/gstid3v2mux.cc	2007-11-24 21:56:04.000000000 +0100
+@@ -532,6 +532,7 @@
+   GST_TAG_TITLE, add_text_tag, "TIT2"}, {
+   GST_TAG_ALBUM, add_text_tag, "TALB"}, {
+   GST_TAG_COPYRIGHT, add_text_tag, "TCOP"}, {
++  GST_TAG_COMPOSER, add_text_tag, "TCOM"}, {
+   GST_TAG_GENRE, add_text_tag, "TCON"}, {
+   GST_TAG_COMMENT, add_comment_tag, ""}, {
+   GST_TAG_EXTENDED_COMMENT, add_comment_tag, ""}, {
+@@ -544,7 +545,9 @@
+   GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, {
+   GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\003"}, {
+   GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, ""}, {
+-  GST_TAG_MUSICBRAINZ_SORTNAME, add_text_tag, "TSOP"}, {
++  GST_TAG_ARTIST_SORTNAME, add_text_tag, "TSOP"}, {
++  GST_TAG_ALBUM_SORTNAME, add_text_tag, "TSOA"}, {
++  GST_TAG_TITLE_SORTNAME, add_text_tag, "TSOT"}, {
+   GST_TAG_TRACK_NUMBER, add_count_or_num_tag, "TRCK"}, {
+   GST_TAG_TRACK_COUNT, add_count_or_num_tag, "TRCK"}, {
+   GST_TAG_ALBUM_VOLUME_NUMBER, add_count_or_num_tag, "TPOS"}, {

pkgs/development/libraries/gstreamer/gstreamer/0.10.17.nix

@@ -0,0 +1,20 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "gstreamer-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/src/gstreamer/${name}.tar.bz2";
+    sha256 = "172nqf6l6mq4r1923bph53xd6h3svha3kkrvy5cald77jgf64a24";
+  };
+
+  buildInputs = [perl bison flex pkgconfig python];
+  propagatedBuildInputs = [glib libxml2];
+
+  configureFlags = "--enable-shared --disable-static --enable-failing-tests
+    --localstatedir=/var";
+
+  meta = {
+    homepage = http://gstreamer.freedesktop.org;
+  };
+}

pkgs/development/libraries/liboil/0.3.12.nix

@@ -0,0 +1,20 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "liboil-" + version;
+
+  src = fetchurl {
+    url = "${meta.homepage}/download/${name}.tar.gz";
+    sha256 = "0gdmly9sli1918pnb4ds1g38ipxikn651hdss86mp4qlfb8wvqlv";
+  };
+
+  configureFlags = "--enable-shared --disable-static";
+
+  buildInputs = [pkgconfig];
+
+  meta = {
+    homepage = http://liboil.freedesktop.org;
+    description = "Liboil is a library of simple functions that are optimized
+    for various CPUs.";
+  };
+}

pkgs/development/libraries/ncurses/default.nix

@@ -7,6 +7,7 @@ stdenv.mkDerivation {
     md5 = "b6593abe1089d6aab1551c105c9300e3";
   };
   configureFlags="--with-shared --includedir=\${out}/include"+(if unicode then  " --enable-widec " else " ") +" --without-debug";
+  preBuild = ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile'';
   postInstall= if unicode then "
     chmod -v 644 $out/lib/libncurses++w.a
     for lib in curses ncurses form panel menu; do

pkgs/os-specific/linux/alsa/1.0.14.nix

@@ -0,0 +1,14 @@
+args: with args;
+
+rec {
+  alsaLib = (import ./common.nix) {
+    aName = "lib";
+    sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
+  } args;
+
+  alsaUtils = (import ./common.nix) {
+    aName = "utils";
+    sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
+    buildInputs = [alsaLib ncurses gettext];
+  } args;
+}

pkgs/os-specific/linux/alsa/1.0.16.nix

@@ -0,0 +1,14 @@
+args: with args;
+
+rec {
+  alsaLib = (import ./common.nix) {
+    aName = "lib";
+    sha256 = "1k96razf5h7blidh5ib54plcrfnbysvwm7vhvz28b4cy20zv66df";
+  } args;
+
+  alsaUtils = (import ./common.nix) {
+    aName = "utils";
+    sha256 = "10bj4pw2hp3f6qzkxsrlnvsxjlpqha696fn10gzdnnzym072skzb";
+    buildInputs = [alsaLib ncurses gettext];
+  } args;
+}

pkgs/os-specific/linux/alsa/common.nix

@@ -0,0 +1,13 @@
+{aName, sha256, buildInputs ? [], propagatedBuildInputs ? [] } :
+args: with args; stdenv.mkDerivation rec {
+  name = "alsa-" + aName + "-" + version;
+
+  src = fetchurl {
+    url = "ftp://ftp.alsa-project.org/pub/" + aName + "/" + name + ".tar.bz2";
+    inherit sha256;
+  };
+
+  inherit buildInputs propagatedBuildInputs;
+
+  meta = { homepage = http://www.alsa-project.org; };
+}

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

@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "alsa-lib-1.0.14";
-  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.14.tar.bz2;
-	sha256 = "18xhm53adgss20jnva2nfl9gk46kb5an6ah820pazqn0ykd97rh1";
-  };
-
-  meta = {
-	  homepage = http://www.alsa-project.org;
-  };
-}

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

@@ -1,14 +0,0 @@
-{stdenv, fetchurl, alsaLib, ncurses, gettext}:
-
-stdenv.mkDerivation {
-  name = "alsa-utils-1.0.14";
-  src = fetchurl {
-    url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.14.tar.bz2;
-    sha256 = "1jx5bwa8abx7aih4lymx4bnrmyip2yb0rp1mza97wpni1q7n6z9h";
-  };
-  buildInputs = [alsaLib ncurses gettext];
-
-  meta = {
-	  homepage = http://www.alsa-project.org;
-  };
-}

pkgs/os-specific/linux/iptables/1.4.0.nix

@@ -0,0 +1,29 @@
+args : with args; with builderDefs {src="";} null;
+  let localDefs = builderDefs (rec {
+    src = /* put a fetchurl here */
+    fetchurl {
+      url = http://www.netfilter.org/projects/iptables/files/iptables-1.4.0.tar.bz2;
+      sha256 = "0ljxbvdlg5mfxk0y00dr0qvsri1d495ci1pr8hrzga766n09g6px";
+    };
+
+    buildInputs = [];
+    configureFlags = [];
+    makeFlags = [
+      " KERNEL_DIR=${kernelHeaders} "
+    ];
+    preBuild = FullDepEntry (''
+      sed -e 's@/usr/local@'$out'@' -i Makefile Rules.make
+    '') ["doUnpack" "minInit"];
+  }) null; /* null is a terminator for sumArgs */
+  in with localDefs;
+stdenv.mkDerivation rec {
+  name = "iptables-"+version;
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs 
+      [preBuild doMakeInstall doForceShare doPropagate]);
+  meta = {
+    description = "
+     IPtables Linux firewall.
+";
+  };
+}

pkgs/os-specific/linux/iptables/default.nix

@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "iptables-1.3.7";
-  src = fetchurl {
-    url = http://www.netfilter.org/projects/iptables/files/iptables-1.3.7.tar.bz2;
-    sha256 = "00nffc03akgm5p0skz90nl29h5d8b9fjc0d9lhipkbwy0ahcw00f";
-  };
-  preBuild = "makeFlagsArray=(PREFIX=$out)";
-}

pkgs/tools/X11/x11vnc/0.9.3.nix

@@ -0,0 +1,27 @@
+args : with args; with builderDefs {src="";} null;
+  let localDefs = builderDefs (rec {
+    src = /* put a fetchurl here */
+    fetchurl {
+      url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz;
+      sha256 = "0sfzkbqd2d94w51czci9w5j5z67amcl1gphgg6x77dyr2h46kc0a";
+    };
+
+    buildInputs = [libXfixes fixesproto openssl libXdamage damageproto
+      zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto
+      libXrandr randrproto libXext xextproto inputproto recordproto];
+    configureFlags = [];
+  }) null; /* null is a terminator for sumArgs */
+  in with localDefs;
+stdenv.mkDerivation rec {
+  name = "x11vnc-"+version;
+  builder = writeScript (name + "-builder")
+    (textClosure localDefs 
+      [doConfigure doMakeInstall doForceShare doPropagate]);
+  meta = {
+    description = "
+    X11 VNC - VNC server connected to real X11 screen.
+";
+    homepage = "http://www.karlrunge.com/x11vnc/";
+  };
+}
+

pkgs/top-level/all-packages.nix

@@ -454,10 +454,9 @@ rec {
       inherit fetchurl stdenv coreutils;
     });
 
-  dosfstoolsFun = lib.sumArgs (selectVersion ../tools/misc/dosfstools)
+  dosfstoolsFun = lib.sumArgs (selectVersion ../tools/misc/dosfstools "2.11deb")
   {
     inherit builderDefs;
-    version = "2.11deb";
   };
 
   dosfstools = dosfstoolsFun null;
@@ -2259,7 +2258,7 @@ rec {
     # python / ruby support
   };
 
-  gettextFun = lib.sumArgs (selectVersion ../development/libraries/gettext "0.16.x") {
+  gettextFun = lib.sumArgs (selectVersion ../development/libraries/gettext "0.17") {
     inherit fetchurl stdenv;
   };
 
@@ -2302,6 +2301,16 @@ rec {
     inherit fetchurl stdenv gmp;
   };
 
+  gst_all = import ../development/libraries/gstreamer {
+    inherit lib selectVersion stdenv fetchurl perl bison flex pkgconfig libxml2
+      python alsaLib cdparanoia libogg libvorbis libtheora freetype liboil
+      libjpeg zlib speex libpng libdv aalib cairo libcaca flac hal libiec61883
+      dbus libavc1394 ladspaH taglib;
+    inherit (xorg) libX11 libXv libXext;
+    inherit (gtkLibs) glib pango gtk;
+    inherit (gnome) gnomevfs;
+  };
+
   gnet = import ../development/libraries/gnet {
     inherit fetchurl stdenv pkgconfig;
     inherit (gtkLibs) glib;
@@ -2595,6 +2604,14 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  liboilFun = lib.sumArgs
+    (selectVersion ../development/libraries/liboil "0.3.12") {
+    inherit fetchurl stdenv pkgconfig;
+  };
+
+  liboil = liboilFun null;
+
+
   liboop = import ../development/libraries/liboop {
     inherit fetchurl stdenv;
   };
@@ -3617,10 +3634,16 @@ rec {
   };
   */
 
-  alsaLib = import ../os-specific/linux/alsa/library {
-    inherit fetchurl stdenv;
+  alsaFun = lib.sumArgs (selectVersion ../os-specific/linux/alsa "1.0.16") {
+    inherit fetchurl stdenv ncurses gettext;
   };
 
+  alsa = alsaFun null;
+
+  alsaLib = alsa.alsaLib;
+
+  alsaUtils = alsa.alsaUtils;
+
   atherosFun = lib.sumArgs (selectVersion ../os-specific/linux/atheros "r3122") {
     inherit fetchurl stdenv builderDefs;
   };
@@ -3637,10 +3660,6 @@ rec {
     inherit fetchurl stdenv autoconf automake;
   };
 
-  alsaUtils = import ../os-specific/linux/alsa/utils {
-    inherit fetchurl stdenv alsaLib ncurses gettext;
-  };
-
   cramfsswap = import ../os-specific/linux/cramfsswap {
     inherit fetchurl stdenv zlib;
   };
@@ -3738,10 +3757,12 @@ rec {
     kernelHeaders = stdenv.gcc.libc.kernelHeaders;
   };
 
-  iptables = import ../os-specific/linux/iptables {
-    inherit fetchurl stdenv;
+  iptablesFun = lib.sumArgs (selectVersion ../os-specific/linux/iptables "1.4.0") {
+    inherit builderDefs kernelHeaders;
   };
 
+  iptables = iptablesFun null;
+
   ipw2200fw = import ../os-specific/linux/firmware/ipw2200 {
     inherit fetchurl stdenv;
   };
@@ -4480,6 +4501,8 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  cdparanoia = cdparanoiaIII;
+
   cdparanoiaIII = import ../applications/audio/cdparanoia {
     inherit fetchurl stdenv;
   };
@@ -4680,7 +4703,7 @@ rec {
   fbpanel = fbpanelFun null;
 
   fetchmail = import ../applications/misc/fetchmail {
-    inherit stdenv fetchurl;
+    inherit stdenv fetchurl openssl python procmail;
   };
 
   wireshark = import ../applications/networking/sniffers/wireshark {
@@ -4757,7 +4780,9 @@ rec {
   };
 
   pidgin = import ../applications/networking/instant-messengers/pidgin {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell GStreamer aspell gettext ncurses;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
+      gtkspell aspell gettext ncurses;
+    GStreamer = gst_all.gstreamer;
     inherit (gtkLibs) gtk;
     inherit (gnome) startupnotification;
     inherit (xlibs) libXScrnSaver;
@@ -4791,8 +4816,8 @@ rec {
   };
 
   gnash = assert mesaSupported; import ../applications/video/gnash {
-    inherit fetchurl stdenv SDL SDL_mixer GStreamer
-            libogg libxml2 libjpeg mesa libpng;
+    inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng;
+    GStreamer = gst_all.gstreamer;
     inherit (xlibs) libX11 libXext libXi libXmu;
   };
 
@@ -4811,11 +4836,6 @@ rec {
     inherit (gtkLibs) gtk;
   };
 
-  GStreamer = import ../applications/audio/GStreamer {
-    inherit fetchurl stdenv perl bison flex pkgconfig libxml2;
-    inherit (gtkLibs) glib;
-  };
-
   gv = import ../applications/misc/gv {
     inherit fetchurl stdenv Xaw3d ghostscriptX;
   };
@@ -5122,7 +5142,7 @@ rec {
 
   # = urxvt
   rxvt_unicode = import ../applications/misc/rxvt_unicode {
-    inherit lib fetchurl stdenv;
+    inherit lib fetchurl stdenv perl;
     inherit (xlibs) libXt libX11 libXft;
   };
 
@@ -5345,6 +5365,15 @@ rec {
     ++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] true && jrePlugin ? mozillaPlugin) jrePlugin;
   };
 
+  x11vncFun = lib.sumArgs (selectVersion ../tools/X11/x11vnc "0.9.3") {
+    inherit builderDefs openssl zlib libjpeg ;
+    inherit (xlibs) libXfixes fixesproto libXdamage damageproto 
+      libX11 xproto libXtst libXinerama xineramaproto libXrandr randrproto
+      libXext xextproto inputproto recordproto;
+  };
+
+  x11vnc = x11vncFun null;
+
   xara = import ../applications/graphics/xara {
     inherit fetchurl stdenv autoconf automake libtool gettext cvs wxGTK
       pkgconfig libxml2 zip libpng libjpeg shebangfix perl freetype;
@@ -5407,8 +5436,8 @@ rec {
   } null;
 
   xterm = import ../applications/misc/xterm {
-    inherit fetchurl stdenv ncurses;
-    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
+    inherit fetchurl stdenv ncurses freetype pkgconfig;
+    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXext libXft luit;
   };
 
   xlaunch = import ../tools/X11/xlaunch {