about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-12-17 05:03:12 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-12-24 04:05:57 +0100
commitd39892699325b85a9a4a222088b8937512e737d9 (patch)
treee3403a524e9f921aa76cbcbc2a6bab647492fc4a /pkgs/applications/graphics
parentd91765d2e08cc15bc996d56194341ecfc40aa3d1 (diff)
saneBackends: simplify buildInputs
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/sane/backends/generic.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 8709531f60930..022cdd72f1082 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