From b3862e2bcf5b658730c206ba12339acbe47b7945 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 31 Oct 2019 17:27:03 +0700 Subject: [PATCH] libusb1: use lib.getLib to find systemd.lib This allows this package to build with eudev instead. --- pkgs/development/libraries/libusb1/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 9a08a7756c84..9d90304042c8 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; {