diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-30 15:47:37 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-30 15:47:37 +0100 |
| commit | 81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d (patch) | |
| tree | 00c48f56f3580ed330620d81e27542e8938ff4d7 /pkgs/os-specific/linux/systemd | |
| parent | c232159feeb49c6b20bcacec291071eecdfecc66 (diff) | |
| parent | e0596c96034978fe70d0295315fa4d584da9416c (diff) | |
| download | nixlib-81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d.tar nixlib-81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d.tar.gz nixlib-81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d.tar.bz2 nixlib-81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d.tar.lz nixlib-81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d.tar.xz nixlib-81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d.tar.zst nixlib-81f6c62004a8ef711a8c23e8bdcf9f4bdf2c072d.zip | |
Merge remote-tracking branch 'origin/master' into systemd-219
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 3 |
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 b4588e3d17f0..a78f51ddb36f 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; @@ -65,7 +66,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 = '' |