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

Review dbus-lib expression 

* Move pkgconfig to buildNativeInputs

svn path=/nixpkgs/branches/stdenv-updates/; revision=30895
This commit is contained in:
Yury G. Kudryashov 2011-12-14 18:22:55 +00:00
parent 5c507048dd
commit 14bbbbbed2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,9 @@ in rec {
libs = stdenv.mkDerivation { libs = stdenv.mkDerivation {
name = "dbus-library-" + version; name = "dbus-library-" + version;
buildInputs = [ pkgconfig expat ]; buildNativeInputs = [ pkgconfig ];
buildInputs = [ expat ];
inherit src patches configureFlags; inherit src patches configureFlags;
@ -42,7 +44,9 @@ in rec {
configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
buildInputs = [ pkgconfig expat libs ] buildNativeInputs = [ pkgconfig ];
buildInputs = [ expat libs ]
++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
NIX_LDFLAGS = "-ldbus-1"; NIX_LDFLAGS = "-ldbus-1";