diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-17 16:39:08 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-24 04:05:57 +0100 |
commit | 6a76cd13362dab971bc2de54b63be96dcd55288a (patch) | |
tree | b4a715302b1af0bf113b9113c02752d0f4c72bdb /pkgs/applications/graphics/sane/backends/generic.nix | |
parent | eeca8c0441d3065d0db3f83fba28cc3c541efb18 (diff) | |
download | nixlib-6a76cd13362dab971bc2de54b63be96dcd55288a.tar nixlib-6a76cd13362dab971bc2de54b63be96dcd55288a.tar.gz nixlib-6a76cd13362dab971bc2de54b63be96dcd55288a.tar.bz2 nixlib-6a76cd13362dab971bc2de54b63be96dcd55288a.tar.lz nixlib-6a76cd13362dab971bc2de54b63be96dcd55288a.tar.xz nixlib-6a76cd13362dab971bc2de54b63be96dcd55288a.tar.zst nixlib-6a76cd13362dab971bc2de54b63be96dcd55288a.zip |
saneBackends: drop libusb override; use libusb1 directly
Diffstat (limited to 'pkgs/applications/graphics/sane/backends/generic.nix')
-rw-r--r-- | pkgs/applications/graphics/sane/backends/generic.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 707a0b091204..e617bcc814d1 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, avahi, libusb, libv4l, net_snmp +, avahi, libusb1, libv4l, net_snmp , gettext, pkgconfig , gt68xxFirmware ? null, snapscanFirmware ? null , hotplugSupport ? true @@ -23,9 +23,10 @@ stdenv.mkDerivation { configureFlags = [] ++ 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 ]; postInstall = '' |