diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2015-03-19 00:49:31 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2015-03-29 23:28:30 +0000 |
| commit | 380ee53fff55a7880ba2e974831b76c068542421 (patch) | |
| tree | 7c550f29788aacef53dcfa078501c4672383f2a7 /pkgs/development/libraries/dbus | |
| parent | eb22e54243cbd7e63f17a56a6bb73526d8112ed2 (diff) | |
| download | nixlib-380ee53fff55a7880ba2e974831b76c068542421.tar nixlib-380ee53fff55a7880ba2e974831b76c068542421.tar.gz nixlib-380ee53fff55a7880ba2e974831b76c068542421.tar.bz2 nixlib-380ee53fff55a7880ba2e974831b76c068542421.tar.lz nixlib-380ee53fff55a7880ba2e974831b76c068542421.tar.xz nixlib-380ee53fff55a7880ba2e974831b76c068542421.tar.zst nixlib-380ee53fff55a7880ba2e974831b76c068542421.zip | |
dbus: rename useX11 option into x11Support, cleanup a bit
Diffstat (limited to 'pkgs/development/libraries/dbus')
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 8fc75721c23a..ad836ac732d1 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool , expat, systemd, glib, dbus_glib, python -, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: +, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: + +assert x11Support -> libX11 != null + && libICE != null + && libSM != null; let version = "1.8.16"; @@ -8,7 +12,7 @@ let inherit (stdenv) lib; - buildInputsX = lib.optionals useX11 [ libX11 libICE libSM ]; + buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ]; # also other parts than "libs" need this statically linked lib makeInternalLib = "(cd dbus && make libdbus-internal.la)"; @@ -57,7 +61,7 @@ let "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ] ++ lib.optional (!useX11) "--without-x"; + ] ++ lib.optional (!x11Support) "--without-x"; enableParallelBuilding = true; |