diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-14 18:23:29 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-24 04:05:57 +0100 |
| commit | ffc04a67e3aa54fdcf162dfdec9fc85535b5e251 (patch) | |
| tree | 6dead05f00cfccf34cfbe18df2d956594c0f052c /pkgs/applications/graphics | |
| parent | 94dbaa7dbf49702a661129168e9093faf60e48f0 (diff) | |
| download | nixlib-ffc04a67e3aa54fdcf162dfdec9fc85535b5e251.tar nixlib-ffc04a67e3aa54fdcf162dfdec9fc85535b5e251.tar.gz nixlib-ffc04a67e3aa54fdcf162dfdec9fc85535b5e251.tar.bz2 nixlib-ffc04a67e3aa54fdcf162dfdec9fc85535b5e251.tar.lz nixlib-ffc04a67e3aa54fdcf162dfdec9fc85535b5e251.tar.xz nixlib-ffc04a67e3aa54fdcf162dfdec9fc85535b5e251.tar.zst nixlib-ffc04a67e3aa54fdcf162dfdec9fc85535b5e251.zip | |
sanebackends{,Git}: add avahi support
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/sane/backends-git.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/graphics/sane/backends.nix | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 149d9a70610d..bf9f4f5c01fc 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -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 , hotplugSupport ? true }: @@ -19,9 +20,12 @@ stdenv.mkDerivation { udevSupport = hotplugSupport; - buildInputs = [ net_snmp ] + buildInputs = [ avahi net_snmp ] ++ stdenv.lib.optional (libusb != null) libusb; + configureFlags = [] + ++ stdenv.lib.optional (avahi != null) "--enable-avahi"; + postInstall = '' if test "$udevSupport" = "1"; then mkdir -p $out/etc/udev/rules.d/ diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index b96f7a4dbc8b..637ed7a20244 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -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 , gt68xxFirmware ? null, snapscanFirmware ? null , hotplugSupport ? true @@ -26,9 +27,11 @@ stdenv.mkDerivation rec { 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 (libv4l != null) libv4l ++ stdenv.lib.optional (pkgconfig != null) pkgconfig |