Revert "Merge pull request #9543 from NixOS/staging.post-15.06"

This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
This commit is contained in:
Eelco Dolstra
2015-10-06 15:24:20 +02:00
parent fe195af944
commit 741bf840da
53 changed files with 385 additions and 652 deletions
+1 -2
View File
@@ -3,7 +3,6 @@
, glib, kbd, libxslt, coreutils, libgcrypt
, kexectools, libmicrohttpd, linuxHeaders
, pythonPackages ? null, pythonSupport ? false
, enableKDbus ? false
}:
assert stdenv.isLinux;
@@ -61,7 +60,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 =
''