svn merge ^/nixpkgs/trunk

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

5 files changed, 30 insertions, 28 deletions

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 2ea53fd4e55a0..be546d76836b8 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
+{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.2";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     ./pam2.patch
   ];
 
-  buildInputs = [x11 libjpeg libpng libXmu freetype pam];
+  buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
 
   NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
 
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 7f29b43e0e14f..2685aad8cf75f 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -1,32 +1,30 @@
-{ stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng
-, pkgconfig, freetype, fontconfig
+{ stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp
+, pkgconfig, freetype, fontconfig, which, imagemagick, curl, saneBackends
 }:
 
 stdenv.mkDerivation rec {
-  name = "fbida-2.07";
+  name = "fbida-2.09";
   
   src = fetchurl {
     url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
-    sha256 = "0i6v3fvjc305pfw48sglb5f22lwxldmfch6mjhqbcp7lqkkxw435";
+    sha256 = "1riia87v5nsx858xnlvc7sspr1p36adjqrdch1255ikr5xbv6h6x";
   };
 
-  preBuild =
-    ''
-      # Fetch a segfault in exiftran (http://bugs.gentoo.org/284753).
-      # `fbida' contains a copy of some internal libjpeg source files.
-      # If these do not match with the actual libjpeg, exiftran may
-      # fail.
-      tar xvf ${libjpeg.src}
-      for i in jpegint.h jpeglib.h jinclude.h transupp.c transupp.h; do
-        cp jpeg-*/$i jpeg/
-      done
-    '';
-
+  buildNativeInputs = [ pkgconfig which ];
   buildInputs =
-    [ pkgconfig libexif libjpeg giflib libpng giflib freetype fontconfig ];
+    [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
+      imagemagick curl saneBackends
+    ];
   
   makeFlags = [ "prefix=$(out)" "verbose=yes" ];
 
+  patchPhase =
+    ''
+    sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
+    '';
+
+  configurePhase = "make config $makeFlags";
+
   crossAttrs = {
     makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
   };
diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix
index 3a688cb6669ed..0836fc159c1f3 100644
--- a/pkgs/applications/networking/browsers/firefox/10.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/10.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "10.0.1";
+  firefoxVersion = "10.0.2";
   
-  xulVersion = "10.0.1"; # this attribute is used by other packages
+  xulVersion = "10.0.2"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "8613957db84e6722ccf1ebf74fab927139614bfc";
+    sha1 = "d9b459d915d4638a48b3e249fcbaf7cafc27e834";
   };
   
   commonConfigureFlags =
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 14fdfdc4660fc..38bacb2511772 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl
+{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
 , lirc, shared_mime_info }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ pkgconfig shared_mime_info ];
 
   buildInputs =
-    [ xineLib libpng readline ncurses curl lirc
+    [ xineLib libpng12 readline ncurses curl lirc
       xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
       xlibs.libXinerama xlibs.libXi xlibs.libXft
     ];
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 7214dad6bcc02..76cc945baef54 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel
+, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel
 , python, which, alsaLib, curl, gawk
 , xorriso, makeself, perl, jdk, pkgconfig
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
-      hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
+      libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk
       pkgconfig which libXmu
     ];
 
@@ -49,12 +49,16 @@ stdenv.mkDerivation {
     echo "VBOX_WITH_WARNINGS_AS_ERRORS :=" >> LocalConfig.kmk
   '';
 
-  buildPhase = ''
+  enableParallelBuilding = true;
+
+  preBuild = ''
     source env.sh
     kmk
     cd out/linux.*/release/bin/src
     export KERN_DIR=${kernel}/lib/modules/*/build
-    make
+  '';
+
+  postBuild = ''
     cd ../../../../..
   '';