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:34:51 -0500
committerWill Dietz <w@wdtz.org>2018-03-25 18:48:28 -0500
commit969499f3e293ed899f5fdaf39b28537aab913460 (patch)
treeec0ebb65614450e24e7629b2b98b2b3a4b8e8b3e /pkgs/development/libraries/libbsd/default.nix
parent88ea78745a92a23fe0d8f4098ff5f990c6a7fac2 (diff)
downloadnixpkgs-969499f3e293ed899f5fdaf39b28537aab913460.tar
nixpkgs-969499f3e293ed899f5fdaf39b28537aab913460.tar.gz
nixpkgs-969499f3e293ed899f5fdaf39b28537aab913460.tar.bz2
nixpkgs-969499f3e293ed899f5fdaf39b28537aab913460.tar.lz
nixpkgs-969499f3e293ed899f5fdaf39b28537aab913460.tar.xz
nixpkgs-969499f3e293ed899f5fdaf39b28537aab913460.tar.zst
nixpkgs-969499f3e293ed899f5fdaf39b28537aab913460.zip
libbsd: more upstream patches
Diffstat (limited to 'pkgs/development/libraries/libbsd/default.nix')
-rw-r--r--pkgs/development/libraries/libbsd/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 52d038e3d6b..ff9412ceb58 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -15,8 +15,14 @@ stdenv.mkDerivation rec {
 
   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;
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+      # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490
+      ./non-glibc.patch
+      # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd
+      ./cdefs.patch
+      # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404
+      ./features.patch
+  ];
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";