Merge pull request #11683 from rvl/fail2ban

Make fail2ban work again
2015-12-22 01:46:18 +01:00
parent 3acf8132c3 75d143ae9a
commit 38a6b5fb43
4 changed files with 69 additions and 65 deletions
@@ -3,14 +3,11 @@
 , glib, kbd, libxslt, coreutils, libgcrypt
 , 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;

-assert pythonSupport -> pythonPackages != null;
-
 stdenv.mkDerivation rec {
  version = "228";
  name = "systemd-${version}";
@@ -32,7 +29,7 @@ stdenv.mkDerivation rec {
         by generating an autoconf'd tarball, but that's probably not
         worth it. */
      autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
-    ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
+    ];

  configureFlags =
    [ "--localstatedir=/var"