summary refs log tree commit diff
path: root/pkgs/development/libraries/libbsd/default.nix
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-03-24 12:27:17 -0500
committerWill Dietz <w@wdtz.org>2018-03-25 18:48:26 -0500
commit88ea78745a92a23fe0d8f4098ff5f990c6a7fac2 (patch)
tree19e8713a8280c7e19bec571c6b7e137b16ea5d5c /pkgs/development/libraries/libbsd/default.nix
parent8349d73c8f57606f95e2b2ffee65e8e9a060ea45 (diff)
downloadnixpkgs-88ea78745a92a23fe0d8f4098ff5f990c6a7fac2.tar
nixpkgs-88ea78745a92a23fe0d8f4098ff5f990c6a7fac2.tar.gz
nixpkgs-88ea78745a92a23fe0d8f4098ff5f990c6a7fac2.tar.bz2
nixpkgs-88ea78745a92a23fe0d8f4098ff5f990c6a7fac2.tar.lz
nixpkgs-88ea78745a92a23fe0d8f4098ff5f990c6a7fac2.tar.xz
nixpkgs-88ea78745a92a23fe0d8f4098ff5f990c6a7fac2.tar.zst
nixpkgs-88ea78745a92a23fe0d8f4098ff5f990c6a7fac2.zip
libbsd: apply upstream patch to fix w/musl
Diffstat (limited to 'pkgs/development/libraries/libbsd/default.nix')
-rw-r--r--pkgs/development/libraries/libbsd/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 0e232a50e94..52d038e3d6b 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   # the configure scripts
   nativeBuildInputs = [ autoreconfHook ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+    # Suitable for all, but limited to musl to avoid rebuilds
+    # https://cgit.freedesktop.org/libbsd/patch/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./non-glibc.patch;
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";