From 05f3d961a986569f462d7e9989e8ac5c223c35aa Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 8 Apr 2020 21:23:38 +0200 Subject: [PATCH] pcsc-cyberjack: Fix build against libusb Commit 59281f742a0ce8def71be3576129b4178ec579bb changed libusb so that it no longer propagates libusb1. This in turn caused the pcsc-cyberjack build to fail with an error like this: usbdev.c:68:3: error: #error "Neither HAL nor USB1 found!. Please install at least either of them." I'm committing this directly to master, since I'm the maintainer of the package and the build also is *already* broken. So the worst case that could happen is that the build is still broken afterwards. Signed-off-by: aszlig --- pkgs/tools/security/pcsc-cyberjack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 8aadb685aa8b..6cee5c1ccbde 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, pcsclite }: +{ stdenv, fetchurl, pkgconfig, libusb1, pcsclite }: stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "tools" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb pcsclite ]; + buildInputs = [ libusb1 pcsclite ]; configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers"