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

sanebackends{,Git}: add avahi support

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-12-14 18:23:29 +01:00
parent 94dbaa7dbf
commit ffc04a67e3
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
{ stdenv, fetchurl, fetchgit, libusb ? null, net_snmp ? null { stdenv, fetchurl, fetchgit
, avahi ? null, libusb ? null, net_snmp ? null
, gt68xxFirmware ? null, snapscanFirmware ? null , gt68xxFirmware ? null, snapscanFirmware ? null
, hotplugSupport ? true , hotplugSupport ? true
}: }:
@ -19,9 +20,12 @@ stdenv.mkDerivation {
udevSupport = hotplugSupport; udevSupport = hotplugSupport;
buildInputs = [ net_snmp ] buildInputs = [ avahi net_snmp ]
++ stdenv.lib.optional (libusb != null) libusb; ++ stdenv.lib.optional (libusb != null) libusb;
configureFlags = []
++ stdenv.lib.optional (avahi != null) "--enable-avahi";
postInstall = '' postInstall = ''
if test "$udevSupport" = "1"; then if test "$udevSupport" = "1"; then
mkdir -p $out/etc/udev/rules.d/ mkdir -p $out/etc/udev/rules.d/

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

@ -1,4 +1,5 @@
{ stdenv, fetchurl, libusb ? null, libv4l ? null, net_snmp ? null { stdenv, fetchurl
, avahi ? null, libusb ? null, libv4l ? null, net_snmp ? null
, pkgconfig ? null , pkgconfig ? null
, gt68xxFirmware ? null, snapscanFirmware ? null , gt68xxFirmware ? null, snapscanFirmware ? null
, hotplugSupport ? true , hotplugSupport ? true
@ -26,9 +27,11 @@ stdenv.mkDerivation rec {
udevSupport = hotplugSupport; udevSupport = hotplugSupport;
configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0"; configureFlags = []
++ stdenv.lib.optional (avahi != null) "--enable-avahi"
++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
buildInputs = [ net_snmp ] buildInputs = [ avahi 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