diff options
| author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2019-10-31 17:27:03 +0700 |
|---|---|---|
| committer | Alexander Bantyev <balsoft75@gmail.com> | 2019-11-11 11:10:32 +0300 |
| commit | b3862e2bcf5b658730c206ba12339acbe47b7945 (patch) | |
| tree | 6613ec6c1668d641c20eca59224edd2e6c45e3f7 | |
| parent | a1cc0f1d5f3c71bdb35a56de56ab37b7de54cf2f (diff) | |
| download | nixpkgs-b3862e2bcf5b658730c206ba12339acbe47b7945.tar nixpkgs-b3862e2bcf5b658730c206ba12339acbe47b7945.tar.gz nixpkgs-b3862e2bcf5b658730c206ba12339acbe47b7945.tar.bz2 nixpkgs-b3862e2bcf5b658730c206ba12339acbe47b7945.tar.lz nixpkgs-b3862e2bcf5b658730c206ba12339acbe47b7945.tar.xz nixpkgs-b3862e2bcf5b658730c206ba12339acbe47b7945.tar.zst nixpkgs-b3862e2bcf5b658730c206ba12339acbe47b7945.zip | |
libusb1: use lib.getLib to find systemd.lib
This allows this package to build with eudev instead.
| -rw-r--r-- | pkgs/development/libraries/libusb1/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 9a08a7756c8..9d90304042c 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -28,13 +28,8 @@ stdenv.mkDerivation (rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - configureFlags = - # We use `isLinux` here only to avoid mass rebuilds for Darwin, where - # disabling udev happens automatically. Remove `isLinux` at next big change! - stdenv.lib.optional (stdenv.isLinux && !enableSystemd) "--disable-udev"; - - preFixup = stdenv.lib.optionalString enableSystemd '' - sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + sed 's,-ludev,-L${stdenv.lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; meta = with stdenv.lib; { |