Author: urkud
Date: Wed Dec 14 18:22:55 2011
New Revision: 30895
URL: https://nixos.org/websvn/nix/?rev=30895&sc=1
Log:
Review dbus-lib expression
* Move pkgconfig to buildNativeInputs
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
Wed Dec 14 18:22:48 2011 (r30894)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
Wed Dec 14 18:22:55 2011 (r30895)
@@ -17,7 +17,9 @@
libs = stdenv.mkDerivation {
name = "dbus-library-" + version;
- buildInputs = [ pkgconfig expat ];
+ buildNativeInputs = [ pkgconfig ];
+
+ buildInputs = [ expat ];
inherit src patches configureFlags;
@@ -42,7 +44,9 @@
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";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
