From 18eff2d1cff3238d08ce66532c9c6b0f251801c0 Mon Sep 17 00:00:00 2001
From: Lila <lila91142@gmail.com>
Date: Sat, 23 May 2020 16:50:23 +0200
Subject: [PATCH 1/2] libusb1: Fix for pkgsMusl
This reintroduces the changes from 370d483 after they were probably accidentally
removed in b3862e2.
---
pkgs/development/libraries/libusb1/default.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 65023814171..5d6a20b13a4 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -33,7 +33,9 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
- preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+ configureFlags = stdenv.lib.optional (!enableSystemd) "--disable-udev";
+
+ preFixup = stdenv.lib.optionalString enableSystemd ''
sed 's,-ludev,-L${stdenv.lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
'';
From 59616b291d60886606ca300c20107722f284cdf7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 8 Jun 2020 17:36:48 -0500
Subject: [PATCH 2/2] =?UTF-8?q?openssh:=20don=E2=80=99t=20include=20fido2?=
=?UTF-8?q?=20on=20musl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
libselinux pulls in openssh transitively, so can’t use fido here
Fixes #89246
---
pkgs/tools/networking/openssh/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index ad5072342f1..1703e8c7559 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -5,7 +5,7 @@
, withGssapiPatches ? false
, kerberos
, libfido2
-, withFIDO ? stdenv.hostPlatform.isUnix
+, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
, linkOpenssl? true
}: