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

dbus: Merge tools and daemon

Browse source 
This resolves a cyclic dependency: the daemon depends on tools (for
dbus-send) while tools depends on the daemon.  Keeping them separate
doesn't seem very useful in any case.
This commit is contained in:
Eelco Dolstra 2014-04-22 16:01:45 +02:00
parent baffee02b8
commit 83b43cfe51
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,9 +84,9 @@ let
inherit libs;
tools = dbus_drv "tools" "tools" {
configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ];
buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon ];
tools = dbus_drv "tools" "tools bus" {
preBuild = makeInternalLib;
buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs ];
NIX_CFLAGS_LINK =
stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
+ "-ldbus-1";
@ -94,10 +94,7 @@ let
meta.platforms = stdenv.lib.platforms.all;
};
daemon = dbus_drv "daemon" "bus" {
preBuild = makeInternalLib;
buildInputs = systemdOrEmpty;
};
daemon = tools;
docs = dbus_drv "docs" "doc" {
postInstall = ''rm -r "$out/lib"'';