summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2020-04-08 21:23:38 +0200
committeraszlig <aszlig@nix.build>2020-04-08 21:27:51 +0200
commit05f3d961a986569f462d7e9989e8ac5c223c35aa (patch)
treeb767cdc8a109a3d3540a03c80ff6ab73ccca62d3 /pkgs/tools/security
parent3847ec0e358b4cab5f53b55dd6e05b7a5efda10d (diff)
downloadnixpkgs-05f3d961a986569f462d7e9989e8ac5c223c35aa.tar
nixpkgs-05f3d961a986569f462d7e9989e8ac5c223c35aa.tar.gz
nixpkgs-05f3d961a986569f462d7e9989e8ac5c223c35aa.tar.bz2
nixpkgs-05f3d961a986569f462d7e9989e8ac5c223c35aa.tar.lz
nixpkgs-05f3d961a986569f462d7e9989e8ac5c223c35aa.tar.xz
nixpkgs-05f3d961a986569f462d7e9989e8ac5c223c35aa.tar.zst
nixpkgs-05f3d961a986569f462d7e9989e8ac5c223c35aa.zip
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 <aszlig@nix.build>
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/pcsc-cyberjack/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 8aadb685aa8..6cee5c1ccbd 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"