alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Update dbus and dbus-glib to the latest stable versions

Browse source 
Drop unstable versions

svn path=/nixpkgs/branches/stdenv-updates/; revision=30893
This commit is contained in:
Yury G. Kudryashov 2011-12-14 18:22:34 +00:00
parent 26046ace01
commit 3103799d47
5 changed files with 6 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/libraries/dbus-glib/0.94.nix
View file

@ -1,23 +0,0 @@
{ 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";
};
}

4
pkgs/development/libraries/dbus-glib/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
stdenv.mkDerivation rec {
name = "dbus-glib-0.86";
name = "dbus-glib-0.98";
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
sha256 = "04fiwld5yaxyggxlvdmbaqkngh4fn8gfkkqckcp3274bpgb82z19";
};
buildInputs = [ pkgconfig expat gettext ]

61
pkgs/development/libraries/dbus/1.5.6.nix
View file

@ -1,61 +0,0 @@
{ 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;
}

6
pkgs/development/libraries/dbus/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
let
version = "1.4.14";
version = "1.4.16";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
sha256 = "1ii93d0lzj5xm564dcq6ca4s0nvm5i9fx3jp0s7i9hlc5wkfd3hx";
};
patches = [ ./ignore-missing-includedirs.patch ];
@ -49,7 +49,7 @@ in rec {
preConfigure =
''
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
'';

12
pkgs/top-level/all-packages.nix
View file

@ -3265,14 +3265,6 @@ let
useX11 = true;
};
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 { };
@ -6063,9 +6055,7 @@ let
untie = callPackage ../os-specific/linux/untie { };
upower = callPackage ../os-specific/linux/upower {
dbus_glib = pkgs.dbus_glib_0_94;
};
upower = callPackage ../os-specific/linux/upower { };
upstart = callPackage ../os-specific/linux/upstart { };