diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-14 03:39:08 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-24 04:05:57 +0100 |
| commit | 94dbaa7dbf49702a661129168e9093faf60e48f0 (patch) | |
| tree | 5de0ebabdde9286fd0526a2272f9d68aeb29a007 /pkgs/applications/graphics | |
| parent | 1d132f38a65f197eaa6454b3514fa874fe247f79 (diff) | |
| download | nixlib-94dbaa7dbf49702a661129168e9093faf60e48f0.tar nixlib-94dbaa7dbf49702a661129168e9093faf60e48f0.tar.gz nixlib-94dbaa7dbf49702a661129168e9093faf60e48f0.tar.bz2 nixlib-94dbaa7dbf49702a661129168e9093faf60e48f0.tar.lz nixlib-94dbaa7dbf49702a661129168e9093faf60e48f0.tar.xz nixlib-94dbaa7dbf49702a661129168e9093faf60e48f0.tar.zst nixlib-94dbaa7dbf49702a661129168e9093faf60e48f0.zip | |
saneBackends{,Git}: add SNMP support
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/sane/backends-git.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sane/backends.nix | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 0c74a470c258..149d9a70610d 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null +{ stdenv, fetchurl, fetchgit, libusb ? null, net_snmp ? null , gt68xxFirmware ? null, snapscanFirmware ? null +, hotplugSupport ? true }: let firmware = gt68xxFirmware { inherit fetchurl; }; @@ -18,7 +19,8 @@ stdenv.mkDerivation { udevSupport = hotplugSupport; - buildInputs = if libusb != null then [libusb] else []; + buildInputs = [ net_snmp ] + ++ stdenv.lib.optional (libusb != null) libusb; postInstall = '' if test "$udevSupport" = "1"; then diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index fb943ac23b5d..b96f7a4dbc8b 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null -, pkgconfig ? null, gt68xxFirmware ? null, snapscanFirmware ? null +{ stdenv, fetchurl, libusb ? null, libv4l ? null, net_snmp ? null +, pkgconfig ? null +, gt68xxFirmware ? null, snapscanFirmware ? null +, hotplugSupport ? true }: assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0"; - buildInputs = [] + buildInputs = [ net_snmp ] ++ stdenv.lib.optional (libusb != null) libusb ++ stdenv.lib.optional (libv4l != null) libv4l ++ stdenv.lib.optional (pkgconfig != null) pkgconfig |