From d39892699325b85a9a4a222088b8937512e737d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 17 Dec 2015 05:03:12 +0100 Subject: [PATCH] saneBackends: simplify buildInputs --- pkgs/applications/graphics/sane/backends/generic.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 8709531f609..022cdd72f10 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, avahi ? null, libusb ? null, libv4l ? null, net_snmp ? null +, avahi, libusb, libv4l, net_snmp , pkgconfig , gt68xxFirmware ? null, snapscanFirmware ? null , hotplugSupport ? true @@ -25,10 +25,8 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (avahi != null) "--enable-avahi" ++ stdenv.lib.optional (libusb != null) "--enable-libusb_1_0"; - buildInputs = [ avahi net_snmp pkgconfig ] - ++ stdenv.lib.optional (libusb != null) libusb - ++ stdenv.lib.optional (libv4l != null) libv4l - ; + buildInputs = [ avahi libusb libv4l net_snmp ]; + nativeBuildInputs = [ pkgconfig ]; postInstall = '' if test "$udevSupport" = "1"; then