public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Revert to DBus 1.0.2; 1.1.20 is broken, it kills the X server when

Browse Source 
you restart the daemon (http://bugs.gentoo.org/show_bug.cgi?id=206509).

svn path=/nixpkgs/trunk/; revision=10984
This commit is contained in:
Eelco Dolstra 2008-03-06 13:02:04 +00:00
parent 7c266891be
commit f2f87036ce
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/dbus/default.nix
View File

@ -1,18 +1,12 @@
args: with args; args: with args;
let let
version = "1.0.2";
version = "1.1.20";
src = fetchurl { src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "0zhl6cxlwfm9hsl7vm8ycif39805zsa1z8f0qnbfh54jmwccl7vg"; sha256 = "1jn652zb81mczsx4rdcwrrzj3lfhx9d107zjfnasc4l5yljl204a";
}; };
configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp"; configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
in rec { in rec {
libs = stdenv.mkDerivation { libs = stdenv.mkDerivation {
name = "dbus-library-" + version; name = "dbus-library-" + version;
buildInputs = [pkgconfig expat]; buildInputs = [pkgconfig expat];
@ -34,16 +28,15 @@ in rec {
makeFlags = "DBUS_DAEMONDIR=${daemon}/bin"; makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
patchPhase = '' patchPhase = ''
substituteInPlace tools/Makefile.in --replace 'test -z "$(localstatelibdir)"' true
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
sed -i '/mkdir.*localstate/d' tools/Makefile.in
''; '';
}; };
# I'm too lazy to separate daemon and libs now. # I'm too lazy to separate daemon and libs now.
daemon = libs; daemon = libs;
# FIXME TODO # FIXME TODO
# After merger it will be better to correct upstart-job instead. # After merger it will be better to correct upstart-job instead.
outPath = daemon.outPath; outPath = daemon.outPath;
} }