public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gamin: Patch bug which clang detects as error

Browse Source
This commit is contained in:
Spencer Whitt 2015-04-05 22:55:22 -04:00
parent 16ccc46c29
commit 15fd97b74d
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gamin/default.nix
View File

@ -16,7 +16,9 @@ stdenv.mkDerivation (rec {
# <sys/socket.h> with Glibc 2.9. # <sys/socket.h> with Glibc 2.9.
configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE"; 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; { meta = with stdenv.lib; {

12
pkgs/development/libraries/gamin/returnval.patch Normal file
View File

@ -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));