nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

saneBackends: drop libusb override; use libusb1 directly

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-12-17 16:39:08 +01:00
parent eeca8c0441
commit 6a76cd1336
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/graphics/sane/backends/generic.nix
View File

@ -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 = ''

1
pkgs/top-level/all-packages.nix
View File

@ -15535,7 +15535,6 @@ let
gt68xxFirmware = config.sane.gt68xxFirmware or null;
snapscanFirmware = config.sane.snapscanFirmware or null;
hotplugSupport = config.sane.hotplugSupport or true;
libusb = libusb1;
};
saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {