public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88692 from Aver1y/libusb-pkgsMusl 

libusb1: Fix for pkgsMusl
This commit is contained in:
Matthew Bauer 2020-06-08 17:38:42 -05:00 committed by GitHub
parent 0a488516be 59616b291d
commit 6231dc774d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libusb1/default.nix
View File

@ -33,7 +33,9 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; 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 sed 's,-ludev,-L${stdenv.lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
''; '';

2
pkgs/tools/networking/openssh/default.nix
View File

@ -5,7 +5,7 @@
, withGssapiPatches ? false , withGssapiPatches ? false
, kerberos , kerberos
, libfido2 , libfido2
, withFIDO ? stdenv.hostPlatform.isUnix , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
, linkOpenssl? true , linkOpenssl? true
}: }: