diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-24 23:53:01 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-27 12:19:12 +0200 |
commit | d0e4ecb182bb2edc890c238abc6055701bcadddb (patch) | |
tree | a9a3fc9b203f73b6d80d0cf7934cced4d4d04ef8 /pkgs | |
parent | f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3 (diff) | |
download | nixpkgs-d0e4ecb182bb2edc890c238abc6055701bcadddb.tar nixpkgs-d0e4ecb182bb2edc890c238abc6055701bcadddb.tar.gz nixpkgs-d0e4ecb182bb2edc890c238abc6055701bcadddb.tar.bz2 nixpkgs-d0e4ecb182bb2edc890c238abc6055701bcadddb.tar.lz nixpkgs-d0e4ecb182bb2edc890c238abc6055701bcadddb.tar.xz nixpkgs-d0e4ecb182bb2edc890c238abc6055701bcadddb.tar.zst nixpkgs-d0e4ecb182bb2edc890c238abc6055701bcadddb.zip |
cnijfilter2: request libusb1 directly
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/misc/cups/drivers/cnijfilter2/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 323163bed33..b04ef89d215 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool +{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool , withDebug ? false }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ - cups automake autoconf glib libxml2 libusb libtool + cups automake autoconf glib libxml2 libusb1 libtool ]; # lgmon3's --enable-libdir flag is used soley for specifying in which @@ -37,7 +37,7 @@ stdenv.mkDerivation { cd lgmon3 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 + ${libusb1.dev}/include/libusb-1.0 ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ --datadir=$out/share \ --enable-libdir=/var/cache/cups diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ead4f47408..7050a0b9ba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25241,9 +25241,7 @@ in cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; - cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { - libusb = libusb1; - }; + cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; darcnes = callPackage ../misc/emulators/darcnes { }; |