summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-03 14:45:56 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-10-03 15:23:13 +0200
commitf361938b210e057906dcdd5471275ddf265e4a4e (patch)
treeea69e01503464f511e388d36fe69c3c689b42fbc /pkgs/os-specific/linux/systemd/default.nix
parentf2cb132c34d115761a19728a2a6a595f4fa08761 (diff)
parentb233ecdca68e08940024da6e4e55e6ef2a20863f (diff)
downloadnixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar
nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.gz
nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.bz2
nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.lz
nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.xz
nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.zst
nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.zip
Merge staging into closure-size
This makes gcc5 the default builder, etc.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 92630fbd9c65..ca0a4ba23b40 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -4,6 +4,7 @@
 , kexectools, libmicrohttpd, linuxHeaders, libseccomp
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , pythonPackages ? null, pythonSupport ? false
+, enableKDbus ? false
 }:
 
 assert stdenv.isLinux;
@@ -69,7 +70,7 @@ stdenv.mkDerivation rec {
       "--with-sysvinit-path="
       "--with-sysvrcnd-path="
       "--with-rc-local-script-path-stop=/etc/halt.local"
-    ];
+    ] ++ stdenv.lib.optional enableKDbus "--enable-kdbus";
 
   preConfigure =
     ''