svn merge ^/nixpkgs/trunk

Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091

pkgs/applications/window-managers/icewm/default.nix

@@ -1,29 +1,35 @@
-{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib
-, xlibs, automake, pkgconfig, gtk }:
+{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype
+, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "icewm-1.3.6";
+  name = "icewm-1.3.7";
 
   buildInputs =
-    [ gettext libjpeg libtiff libungif libpng imlib
+    [ gettext libjpeg libtiff libungif libpng
       xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr
-      pkgconfig gtk
+      xlibs.libICE xlibs.libSM freetype fontconfig
+      pkgconfig gdk_pixbuf
     ];
 
   src = fetchurl {
     url = "mirror://sourceforge/icewm/${name}.tar.gz";
-    sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91";
+    sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na";
   };
 
   NIX_LDFLAGS = "-lfontconfig";
 
   # The fuloong2f is not supported by 1.3.6 still
+  #
+  # Don't know whether 1.3.7 supports fuloong2f and don't know how to test it
+  # on x86_64 hardware. So I left this 'cp' -- urkud
+
   preConfigure = ''
-    cp ${automake}/share/automake*/config.{sub,guess} .
+    cp -v ${automake}/share/automake*/config.{sub,guess} .
   '';
 
   meta = {
     description = "A window manager for the X Window System";
     homepage = http://www.icewm.org/;
+    platforms = stdenv.lib.platforms.unix;
   };
 }