summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-01-14 00:46:32 -0600
committerWill Dietz <w@wdtz.org>2018-02-13 09:44:55 -0600
commite25153a9b860153a28f1d4e11156c49d9d8df908 (patch)
tree81ff9a09650d31c20f73853b53e310e9611659ca
parente7580d0f92fddadbd8c67ed759f55c81d2f5a25f (diff)
downloadnixlib-e25153a9b860153a28f1d4e11156c49d9d8df908.tar
nixlib-e25153a9b860153a28f1d4e11156c49d9d8df908.tar.gz
nixlib-e25153a9b860153a28f1d4e11156c49d9d8df908.tar.bz2
nixlib-e25153a9b860153a28f1d4e11156c49d9d8df908.tar.lz
nixlib-e25153a9b860153a28f1d4e11156c49d9d8df908.tar.xz
nixlib-e25153a9b860153a28f1d4e11156c49d9d8df908.tar.zst
nixlib-e25153a9b860153a28f1d4e11156c49d9d8df908.zip
gamin: patch from alpine to fix non-portable pthread mutex init
-rw-r--r--pkgs/development/libraries/gamin/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index e6b1875a9e0c..2dd32b6f1100 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, glib }:
+{ stdenv, fetchurl, fetchpatch, python, pkgconfig, glib }:
 
 stdenv.mkDerivation (rec {
   name = "gamin-0.1.10";
@@ -18,7 +18,12 @@ stdenv.mkDerivation (rec {
 
   patches = [ ./deadlock.patch ]
     ++ map fetchurl (import ./debian-patches.nix)
-    ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch;
+    ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
+      name = "fix-pthread-mutex.patch";
+      url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
+      sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
+    });
 
 
   meta = with stdenv.lib; {