From 2683407fe4fa0386a3b39c9f34763fab6258f11f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 26 Aug 2011 14:57:48 +0000 Subject: [PATCH] Add newer dbus and dbus-glib Old versions are kept to prevent huge rebuild svn path=/nixpkgs/trunk/; revision=28836 --- .../libraries/dbus-glib/{default.nix => 0.94.nix} | 14 +++++++------- pkgs/development/libraries/dbus-glib/default.nix | 2 +- .../libraries/dbus/{default.nix => 1.5.6.nix} | 20 ++++++++++---------- pkgs/development/libraries/dbus/default.nix | 16 ++++++++-------- pkgs/os-specific/linux/upower/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 14 +++++++++++--- 6 files changed, 40 insertions(+), 33 deletions(-) copy pkgs/development/libraries/dbus-glib/{default.nix => 0.94.nix} (76%) copy pkgs/development/libraries/dbus/{default.nix => 1.5.6.nix} (92%) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/0.94.nix similarity index 76% copy from pkgs/development/libraries/dbus-glib/default.nix copy to pkgs/development/libraries/dbus-glib/0.94.nix index 4a2cd6f4cf95..83c1693d80f7 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/0.94.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.86"; - + name = "dbus-glib-0.94"; + src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak"; + sha256 = "16yk106bp58in6vz2li2s3iwk1si65f0n22m8c2mplzh2j9zlq74"; }; - + buildInputs = [ pkgconfig expat gettext ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - - propagatedBuildInputs = [ dbus.libs glib ]; - + + propagatedBuildInputs = [ dbus glib ]; + passthru = { inherit dbus glib; }; meta = { diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 4a2cd6f4cf95..467b9c4d506a 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/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"; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/1.5.6.nix similarity index 92% copy from pkgs/development/libraries/dbus/default.nix copy to pkgs/development/libraries/dbus/1.5.6.nix index 16d685e4d815..a5ba03159f1c 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/1.5.6.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: let - version = "1.4.14"; - + version = "1.5.6"; + src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7"; + 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 @@ -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 = diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 16d685e4d815..1d0bcc111460 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/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 = diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 441a1a06c401..b0feb09cb86a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1c2b2f74vxx1y7vkwbrx5z4j5pdgvsw00l6cldvy7a4k7hrbprq6"; }; - buildInputs = - [ xz pkgconfig glib dbus dbus_glib polkit intltool - libxslt docbook_xsl udev libusb1 - ]; + buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; + + buildNativeInputs = [ xz pkgconfig ]; configureFlags = "--with-backend=linux --localstatedir=/var"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f52a624d3272..d416c5eff42f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3144,10 +3144,16 @@ let useX11 = true; }; - dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) { - inherit fetchurl stdenv pkgconfig gettext dbus expat glib libiconv; + dbus_all_1_5_6 = callPackage ../development/libraries/dbus/1.5.6.nix { + 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 { }; -- 2.11.4.GIT