diff options
| author | Spencer Whitt <sw@swhitt.me> | 2015-04-05 22:55:22 -0400 |
|---|---|---|
| committer | Spencer Whitt <sw@swhitt.me> | 2015-04-07 13:48:26 -0400 |
| commit | 15fd97b74d7463dd82169b2e5f9976951e8cfcad (patch) | |
| tree | 7c21bf9f31c94dcb1f22e73016e260d0c4ce47dc | |
| parent | Revert "nodejs: Update to 0.12.2" (diff) | |
| download | nixpkgs-15fd97b74d7463dd82169b2e5f9976951e8cfcad.tar.gz | |
gamin: Patch bug which clang detects as error
| -rw-r--r-- | pkgs/development/libraries/gamin/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gamin/returnval.patch | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 22a4597abbe3..0b22aa501e64 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/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; { diff --git a/pkgs/development/libraries/gamin/returnval.patch b/pkgs/development/libraries/gamin/returnval.patch new file mode 100644 index 000000000000..3944b14be64c --- /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)); |