Merge pull request #7244 from spwhitt/fail2ban

fail2ban and gamin: fixes on Darwin

pkgs/development/libraries/gamin/default.nix

@@ -16,7 +16,9 @@ stdenv.mkDerivation (rec {
   # <sys/socket.h> with Glibc 2.9.
   configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
 
-  patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix);
+  patches = [ ./deadlock.patch ]
+    ++ map fetchurl (import ./debian-patches.nix)
+    ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch;
 
 
   meta = with stdenv.lib; {

pkgs/development/libraries/gamin/returnval.patch

@@ -0,0 +1,12 @@
+diff -rupN gamin-0.1.10-orig/server/gam_eq.c gamin-0.1.10/server/gam_eq.c
+--- gamin-0.1.10-orig/server/gam_eq.c	2015-04-05 19:25:54.000000000 -0400
++++ gamin-0.1.10/server/gam_eq.c	2015-04-05 19:26:00.000000000 -0400
+@@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP
+ {
+ 	gboolean done_work = FALSE;
+ 	if (!eq)
+-		return;
++		return done_work;
+ 
+ #ifdef GAM_EQ_VERBOSE
+ 	GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn));

pkgs/tools/security/fail2ban/default.nix

@@ -14,7 +14,8 @@ pythonPackages.buildPythonPackage {
 
   buildInputs = [ unzip ];
 
-  pythonPath = [ systemd python.modules.sqlite3 gamin ];
+  pythonPath = (stdenv.lib.optional stdenv.isLinux systemd)
+    ++ [ python.modules.sqlite3 gamin ];
 
   preConfigure = ''
     substituteInPlace setup.cfg \