From 14bbbbbed249936185785af73a7d20a3a2b7548d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Dec 2011 18:22:55 +0000 Subject: [PATCH] Review dbus-lib expression * Move pkgconfig to buildNativeInputs svn path=/nixpkgs/branches/stdenv-updates/; revision=30895 --- pkgs/development/libraries/dbus/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index c4bab3ba853c..c943fe87fb38 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -17,7 +17,9 @@ in rec { libs = stdenv.mkDerivation { name = "dbus-library-" + version; - buildInputs = [ pkgconfig expat ]; + buildNativeInputs = [ pkgconfig ]; + + buildInputs = [ expat ]; inherit src patches configureFlags; @@ -42,7 +44,9 @@ in rec { configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; - buildInputs = [ pkgconfig expat libs ] + buildNativeInputs = [ pkgconfig ]; + + buildInputs = [ expat libs ] ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; NIX_LDFLAGS = "-ldbus-1";