use --with-dbus-daemondir= cause DBUS_DAEMONDIR seems to be broken?
dbus-launch no longer reports any errors svn path=/nixpkgs/trunk/; revision=19919
This commit is contained in:
parent
ef9ef781ea
commit
cb9030b947
@ -31,7 +31,9 @@ in rec {
|
|||||||
tools = stdenv.mkDerivation {
|
tools = stdenv.mkDerivation {
|
||||||
name = "dbus-tools-" + version;
|
name = "dbus-tools-" + version;
|
||||||
|
|
||||||
inherit src configureFlags;
|
inherit src;
|
||||||
|
|
||||||
|
configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
|
||||||
|
|
||||||
buildInputs = [pkgconfig expat libs]
|
buildInputs = [pkgconfig expat libs]
|
||||||
++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
|
++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
|
||||||
@ -39,8 +41,6 @@ in rec {
|
|||||||
postConfigure = "cd tools";
|
postConfigure = "cd tools";
|
||||||
|
|
||||||
NIX_LDFLAGS = "-ldbus-1";
|
NIX_LDFLAGS = "-ldbus-1";
|
||||||
|
|
||||||
makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
|
|
||||||
|
|
||||||
patchPhase =
|
patchPhase =
|
||||||
''
|
''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user