summary refs log tree commit diff
path: root/pkgs/development/libraries/libbsd/default.nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-10-13 12:41:06 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-10-13 13:39:17 -0400
commit7d364b94009ec94eaf72d6a41491053614690100 (patch)
tree5de3e630964f63447d5cfa174577193fb79fe3c6 /pkgs/development/libraries/libbsd/default.nix
parent23e417f218a0859e50e0a2630d39c748da90d973 (diff)
Revert "Revert "libbsd: 0.9.1 -> 0.10.0 (#66948)""
This reverts commit 9e7582c74b1e6785e5517122f4ca2339503e6238.

* Updates libbsd along with the darwin.patch.
* Upstream PR for darwin.patch can be found at
https://gitlab.freedesktop.org/libbsd/libbsd/merge_requests/3.
* musl.patch is removed.
Diffstat (limited to 'pkgs/development/libraries/libbsd/default.nix')
-rw-r--r--pkgs/development/libraries/libbsd/default.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index fe4af163a542b..e251295a4c79a 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -2,20 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "libbsd";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
+    sha256 = "11x8q45jvjvf2dvgclds64mscyg10lva33qinf2hwgc84v3svf1l";
   };
 
   # darwin changes configure.ac which means we need to regenerate
   # the configure scripts
   nativeBuildInputs = [ autoreconfHook ];
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
-    # Suitable for all but limited to musl to avoid rebuild
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch;
+  patches = [ ./darwin.patch ];
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";