From 15fd97b74d7463dd82169b2e5f9976951e8cfcad Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sun, 5 Apr 2015 22:55:22 -0400 Subject: [PATCH 1/2] gamin: Patch bug which clang detects as error --- pkgs/development/libraries/gamin/default.nix | 4 +++- pkgs/development/libraries/gamin/returnval.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gamin/returnval.patch diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 22a4597abbe..0b22aa501e6 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation (rec { # 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; { diff --git a/pkgs/development/libraries/gamin/returnval.patch b/pkgs/development/libraries/gamin/returnval.patch new file mode 100644 index 00000000000..3944b14be64 --- /dev/null +++ b/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)); From 3885fc5c3bf34f0fd481ec5f9dd608a9d94eff14 Mon Sep 17 00:00:00 2001 From: Spencer Whitt Date: Sun, 5 Apr 2015 22:52:47 -0400 Subject: [PATCH 2/2] fail2ban: include systemd on Linux only --- pkgs/tools/security/fail2ban/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index b77f1694772..03e193dacc7 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/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 \