* Sync with the trunk.

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

pkgs/development/libraries/libpcap/libpcap_amd64.patch

@@ -0,0 +1,26 @@
+diff --git a/pcap.c b/pcap.c
+index 010ef74..0bfb191 100644
+--- a/pcap.c
++++ b/pcap.c
+@@ -211,7 +211,7 @@ pcap_set_buffer_size(pcap_t *p, int buffer_size)
+ 	return 0;
+ }
+ 
+-int
++pcap_t *
+ pcap_activate(pcap_t *p)
+ {
+ 	int status;
+diff --git a/pcap/pcap.h b/pcap/pcap.h
+index ea18edc..3910a2d 100644
+--- a/pcap/pcap.h
++++ b/pcap/pcap.h
+@@ -263,7 +263,7 @@ int	pcap_can_set_rfmon(pcap_t *);
+ int	pcap_set_rfmon(pcap_t *, int);
+ int	pcap_set_timeout(pcap_t *, int);
+ int	pcap_set_buffer_size(pcap_t *, int);
+-int	pcap_activate(pcap_t *);
++pcap_t	*pcap_activate(pcap_t *);
+ 
+ pcap_t	*pcap_open_live(const char *, int, int, int, char *);
+ pcap_t	*pcap_open_dead(int, int);

pkgs/development/libraries/qt-4/default.nix

@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     -system-zlib -system-libpng -system-libjpeg -fast
     -qt-gif -confirm-license
     -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql
-    -qdbus -cups -glib -xfixes
+    -qdbus -cups -glib -xfixes -dbus-linked
     -fontconfig -I${freetype}/include/freetype2
   '';
 

pkgs/development/perl-modules/BerkeleyDB/default.nix

@@ -1,11 +1,11 @@
-{fetchurl, perl, db4}:
+{buildPerlPackage, fetchurl, db4}:
 
-import ../generic perl {
-  name = "BerkeleyDB-0.27";
+buildPerlPackage rec {
+  name = "BerkeleyDB-0.36";
   
   src = fetchurl {
-    url = http://nixos.org/tarballs/BerkeleyDB-0.27.tar.gz;
-    md5 = "43aa72c0c6941af0d656d749ad543e96";
+    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";
   };
 
   preConfigure = ''