diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
tree | 07065424002052ed9e726b4feb689697845ff4a7 /pkgs/os-specific/linux/systemd | |
parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) | |
download | nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.gz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.bz2 nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.lz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.xz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.zst nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.zip |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
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 = '' |