From 969499f3e293ed899f5fdaf39b28537aab913460 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 12:34:51 -0500 Subject: libbsd: more upstream patches --- pkgs/development/libraries/libbsd/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/libbsd/default.nix') 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"; -- cgit 1.4.1