Merge staging into closure-size

This makes gcc5 the default builder, etc.
2015-10-03 14:45:56 +02:00
parent f2cb132c34 b233ecdca6
commit f361938b21
57 changed files with 668 additions and 396 deletions
--- 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 =
    ''