diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-14 18:22:55 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-14 18:22:55 +0000 |
| commit | 14bbbbbed249936185785af73a7d20a3a2b7548d (patch) | |
| tree | b4709dfb1aabbf1e6d5da78419d2e397440e5497 /pkgs/development/libraries/dbus | |
| parent | 5c507048ddc836585961e4fc175fc531a701196a (diff) | |
| download | nixlib-14bbbbbed249936185785af73a7d20a3a2b7548d.tar nixlib-14bbbbbed249936185785af73a7d20a3a2b7548d.tar.gz nixlib-14bbbbbed249936185785af73a7d20a3a2b7548d.tar.bz2 nixlib-14bbbbbed249936185785af73a7d20a3a2b7548d.tar.lz nixlib-14bbbbbed249936185785af73a7d20a3a2b7548d.tar.xz nixlib-14bbbbbed249936185785af73a7d20a3a2b7548d.tar.zst nixlib-14bbbbbed249936185785af73a7d20a3a2b7548d.zip | |
Review dbus-lib expression
* Move pkgconfig to buildNativeInputs svn path=/nixpkgs/branches/stdenv-updates/; revision=30895
Diffstat (limited to 'pkgs/development/libraries/dbus')
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 8 |
1 files 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"; |