public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saneBackends{,Git}: add SNMP support

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-12-14 03:39:08 +01:00
parent 1d132f38a6
commit 94dbaa7dbf
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/sane/backends-git.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null { stdenv, fetchurl, fetchgit, libusb ? null, net_snmp ? null
, gt68xxFirmware ? null, snapscanFirmware ? null , gt68xxFirmware ? null, snapscanFirmware ? null
, hotplugSupport ? true
}: }:
let let
firmware = gt68xxFirmware { inherit fetchurl; }; firmware = gt68xxFirmware { inherit fetchurl; };
@ -18,7 +19,8 @@ stdenv.mkDerivation {
udevSupport = hotplugSupport; udevSupport = hotplugSupport;
buildInputs = if libusb != null then [libusb] else []; buildInputs = [ net_snmp ]
++ stdenv.lib.optional (libusb != null) libusb;
postInstall = '' postInstall = ''
if test "$udevSupport" = "1"; then if test "$udevSupport" = "1"; then

8
pkgs/applications/graphics/sane/backends.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null { stdenv, fetchurl, libusb ? null, libv4l ? null, net_snmp ? null
, pkgconfig ? null, gt68xxFirmware ? null, snapscanFirmware ? null , pkgconfig ? null
, gt68xxFirmware ? null, snapscanFirmware ? null
, hotplugSupport ? true
}: }:
assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); 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"; configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
buildInputs = [] buildInputs = [ net_snmp ]
++ stdenv.lib.optional (libusb != null) libusb ++ stdenv.lib.optional (libusb != null) libusb
++ stdenv.lib.optional (libv4l != null) libv4l ++ stdenv.lib.optional (libv4l != null) libv4l
++ stdenv.lib.optional (pkgconfig != null) pkgconfig ++ stdenv.lib.optional (pkgconfig != null) pkgconfig