From aa2b9c9e99e4a13e0deeacc779a6c11275ba6a8a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Apr 2020 08:32:08 +0200 Subject: [PATCH] aravis: fix build It was using libusb-compat instead of libusb1, and the former no longer propagates the latter. --- pkgs/development/libraries/aravis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index eaeddbcad36..40a96553fbe 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool -, audit, glib, libusb, libxml2 +, audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null , gst-plugins-base ? null @@ -53,7 +53,7 @@ in buildInputs = [ glib libxml2 ] - ++ stdenv.lib.optional enableUsb libusb + ++ stdenv.lib.optional enableUsb libusb1 ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];