saneBackends: drop libusb override; use libusb1 directly
This commit is contained in:
parent
eeca8c0441
commit
6a76cd1336
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl
|
{ stdenv, fetchurl
|
||||||
, avahi, libusb, libv4l, net_snmp
|
, avahi, libusb1, libv4l, net_snmp
|
||||||
, gettext, pkgconfig
|
, gettext, pkgconfig
|
||||||
, gt68xxFirmware ? null, snapscanFirmware ? null
|
, gt68xxFirmware ? null, snapscanFirmware ? null
|
||||||
, hotplugSupport ? true
|
, hotplugSupport ? true
|
||||||
|
@ -23,9 +23,10 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
configureFlags = []
|
configureFlags = []
|
||||||
++ stdenv.lib.optional (avahi != null) "--enable-avahi"
|
++ stdenv.lib.optional (avahi != null) "--enable-avahi"
|
||||||
++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
|
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
|
||||||
|
;
|
||||||
|
|
||||||
buildInputs = [ avahi libusb libv4l net_snmp ];
|
buildInputs = [ avahi libusb1 libv4l net_snmp ];
|
||||||
nativeBuildInputs = [ gettext pkgconfig ];
|
nativeBuildInputs = [ gettext pkgconfig ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
|
@ -15535,7 +15535,6 @@ let
|
||||||
gt68xxFirmware = config.sane.gt68xxFirmware or null;
|
gt68xxFirmware = config.sane.gt68xxFirmware or null;
|
||||||
snapscanFirmware = config.sane.snapscanFirmware or null;
|
snapscanFirmware = config.sane.snapscanFirmware or null;
|
||||||
hotplugSupport = config.sane.hotplugSupport or true;
|
hotplugSupport = config.sane.hotplugSupport or true;
|
||||||
libusb = libusb1;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {
|
saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {
|
||||||
|
|
Loading…
Reference in a new issue