pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #7244 from spwhitt/fail2ban

fail2ban and gamin: fixes on Darwin

Arseniy Seroka 1035b7b6 74b2253e

+17 -2
+3 -1
pkgs/development/libraries/gamin/default.nix
··· 16 16 # <sys/socket.h> with Glibc 2.9. 17 17 configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; 18 18 19 - patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix); 19 + patches = [ ./deadlock.patch ] 20 + ++ map fetchurl (import ./debian-patches.nix) 21 + ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch; 20 22 21 23 22 24 meta = with stdenv.lib; {
+12
pkgs/development/libraries/gamin/returnval.patch
··· 1 + diff -rupN gamin-0.1.10-orig/server/gam_eq.c gamin-0.1.10/server/gam_eq.c 2 + --- gamin-0.1.10-orig/server/gam_eq.c 2015-04-05 19:25:54.000000000 -0400 3 + +++ gamin-0.1.10/server/gam_eq.c 2015-04-05 19:26:00.000000000 -0400 4 + @@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP 5 + { 6 + gboolean done_work = FALSE; 7 + if (!eq) 8 + - return; 9 + + return done_work; 10 + 11 + #ifdef GAM_EQ_VERBOSE 12 + GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn));
+2 -1
pkgs/tools/security/fail2ban/default.nix
··· 14 14 15 15 buildInputs = [ unzip ]; 16 16 17 - pythonPath = [ systemd python.modules.sqlite3 gamin ]; 17 + pythonPath = (stdenv.lib.optional stdenv.isLinux systemd) 18 + ++ [ python.modules.sqlite3 gamin ]; 18 19 19 20 preConfigure = '' 20 21 substituteInPlace setup.cfg \