public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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; inherit libs;
tools = dbus_drv "tools" "tools" { tools = dbus_drv "tools" "tools bus" {
configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ]; preBuild = makeInternalLib;
buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon ]; buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs ];
NIX_CFLAGS_LINK = NIX_CFLAGS_LINK =
stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed " stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
+ "-ldbus-1"; + "-ldbus-1";
@ -94,10 +94,7 @@ let
meta.platforms = stdenv.lib.platforms.all; meta.platforms = stdenv.lib.platforms.all;
}; };
daemon = dbus_drv "daemon" "bus" { daemon = tools;
preBuild = makeInternalLib;
buildInputs = systemdOrEmpty;
};
docs = dbus_drv "docs" "doc" { docs = dbus_drv "docs" "doc" {
postInstall = ''rm -r "$out/lib"''; postInstall = ''rm -r "$out/lib"'';