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

* Merge the temporary copy of dbus.

Browse Source 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18052
This commit is contained in:
Eelco Dolstra 2009-10-30 12:36:32 +00:00
parent 404007aab3
commit 6f04e6a5d6
3 changed files with 13 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ let
sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln"; sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
}; };
configureFlags = "--localstatedir=/var --with-session-socket-dir=/tmp"; configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
in rec { in rec {
@ -19,10 +19,13 @@ in rec {
inherit src configureFlags; inherit src configureFlags;
patchPhase = '' patchPhase =
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in ''
sed -i '/SUBDIRS/s/ tools//' Makefile.in sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
''; sed -i '/SUBDIRS/s/ tools//' Makefile.in
'';
installFlags = "sysconfdir=$(out)/etc";
}; };
tools = stdenv.mkDerivation { tools = stdenv.mkDerivation {
@ -39,10 +42,11 @@ in rec {
makeFlags = "DBUS_DAEMONDIR=${daemon}/bin"; makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
patchPhase = '' patchPhase =
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in ''
substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
''; substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
'';
}; };
# I'm too lazy to separate daemon and libs now. # I'm too lazy to separate daemon and libs now.

58
pkgs/development/libraries/dbus/temp.nix
View File

@ -1,58 +0,0 @@
{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}:
let
version = "1.2.16";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
};
configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
in rec {
libs = stdenv.mkDerivation {
name = "dbus-library-" + version;
buildInputs = [pkgconfig expat];
inherit src configureFlags;
patchPhase =
''
sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
sed -i '/SUBDIRS/s/ tools//' Makefile.in
'';
installFlags = "sysconfdir=$(out)/etc";
};
tools = stdenv.mkDerivation {
name = "dbus-tools-" + version;
inherit src configureFlags;
buildInputs = [pkgconfig expat libs]
++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
postConfigure = "cd tools";
NIX_LDFLAGS = "-ldbus-1";
makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
patchPhase =
''
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
'';
};
# I'm too lazy to separate daemon and libs now.
daemon = libs;
# FIXME TODO
# After merger it will be better to correct upstart-job instead.
outPath = daemon.outPath;
}

7
pkgs/top-level/all-packages.nix
View File

@ -3222,13 +3222,6 @@ let
useX11 = true; # !!! `false' doesn't build useX11 = true; # !!! `false' doesn't build
}; };
# !!! temporary fork; will replace dbus soon.
dbus_temp = import ../development/libraries/dbus/temp.nix {
inherit fetchurl stdenv pkgconfig expat;
inherit (xlibs) libX11 libICE libSM;
useX11 = true; # !!! `false' doesn't build
};
dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) { dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) {
inherit fetchurl stdenv pkgconfig gettext dbus expat glib; inherit fetchurl stdenv pkgconfig gettext dbus expat glib;
}; };