Add newer dbus and dbus-glib

Old versions are kept to prevent huge rebuild

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

pkgs/development/libraries/dbus-glib/0.94.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
+
+stdenv.mkDerivation rec {
+  name = "dbus-glib-0.94";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
+    sha256 = "16yk106bp58in6vz2li2s3iwk1si65f0n22m8c2mplzh2j9zlq74";
+  };
+
+  buildInputs = [ pkgconfig expat gettext ]
+                ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+
+  propagatedBuildInputs = [ dbus glib ];
+
+  passthru = { inherit dbus glib; };
+
+  meta = {
+    homepage = http://dbus.freedesktop.org;
+    license = "AFL-2.1 or GPL-2";
+    description = "GLib bindings for D-Bus lightweight IPC mechanism";
+  };
+}

pkgs/development/libraries/dbus-glib/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbus-glib-0.86";
-  
+
   src = fetchurl {
     url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
     sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";

pkgs/development/libraries/dbus/1.5.6.nix

@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
+
+let
+  version = "1.5.6";
+
+  src = fetchurl {
+    url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
+    sha256 = "18g5328wnh25p0hihv5gg55q5l019zzwr04shvp67myvwy07m851";
+  };
+
+  patches = [ ./ignore-missing-includedirs.patch ];
+
+  configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
+
+in rec {
+
+  libs = stdenv.mkDerivation {
+    name = "dbus-library-" + version;
+
+    buildInputs = [ pkgconfig expat ];
+
+    inherit src patches configureFlags;
+
+    preConfigure =
+      ''
+        sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
+        sed -i '/SUBDIRS/s/ tools//' Makefile.in
+      '';
+
+    # Enable X11 autolaunch support in libdbus.  This doesn't actually
+    # depend on X11 (it just execs dbus-launch in dbus.tools),
+    # contrary to what the configure script demands.
+    NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
+
+    installFlags = "sysconfdir=$(out)/etc";
+  };
+
+  tools = stdenv.mkDerivation {
+    name = "dbus-tools-" + version;
+
+    inherit src patches;
+
+    configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
+
+    buildInputs = [ pkgconfig expat libs ]
+      ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
+
+    NIX_LDFLAGS = "-ldbus-1";
+
+    preConfigure =
+      ''
+        sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
+        substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
+      '';
+
+    postConfigure = "cd tools";
+  };
+
+  # I'm too lazy to separate daemon and libs now.
+  daemon = libs;
+}

pkgs/development/libraries/dbus/default.nix

@@ -2,25 +2,25 @@
 
 let
   version = "1.4.14";
-  
+
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
     sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
   };
 
   patches = [ ./ignore-missing-includedirs.patch ];
-  
+
   configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
-  
+
 in rec {
 
   libs = stdenv.mkDerivation {
     name = "dbus-library-" + version;
-    
+
     buildInputs = [ pkgconfig expat ];
-    
+
     inherit src patches configureFlags;
-    
+
     preConfigure =
       ''
         sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
@@ -41,10 +41,10 @@ in rec {
     inherit src patches;
 
     configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
-    
+
     buildInputs = [ pkgconfig expat libs ]
       ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
-      
+
     NIX_LDFLAGS = "-ldbus-1";
 
     preConfigure =

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

@@ -11,10 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6";
   };
 
-  buildInputs =
+  buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ];
-    [ xz pkgconfig glib dbus dbus_glib polkit intltool
+
-      libxslt docbook_xsl udev libusb1
+  buildNativeInputs = [ xz pkgconfig ];
-    ];
 
   configureFlags = "--with-backend=linux --localstatedir=/var";
 

pkgs/top-level/all-packages.nix

@@ -3144,10 +3144,16 @@ let
     useX11 = true;
   };
 
-  dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
+  dbus_all_1_5_6 = callPackage ../development/libraries/dbus/1.5.6.nix {
-    inherit fetchurl stdenv pkgconfig gettext dbus expat glib libiconv;
+    useX11 = true;
   };
 
+  dbus_glib_0_94 = callPackage ../development/libraries/dbus-glib/0.94.nix {
+    dbus = pkgs.dbus_all_1_5_6.libs;
+  };
+
+  dbus_glib = callPackage ../development/libraries/dbus-glib { };
+
   dbus_java = callPackage ../development/libraries/java/dbus-java { };
 
   dclib = callPackage ../development/libraries/dclib { };
@@ -5858,7 +5864,9 @@ let
 
   untie = callPackage ../os-specific/linux/untie {};
 
-  upower = callPackage ../os-specific/linux/upower { };
+  upower = callPackage ../os-specific/linux/upower {
+    dbus_glib = pkgs.dbus_glib_0_94;
+  };
 
   upstart = callPackage ../os-specific/linux/upstart { };