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

aravis: fix build

Browse Source 
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
This commit is contained in:
Jan Tojnar 2020-04-04 08:32:08 +02:00
parent 48271f8db9
commit aa2b9c9e99
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/aravis/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool
, audit, glib, libusb, libxml2 , audit, glib, libusb1, libxml2
, wrapGAppsHook , wrapGAppsHook
, gstreamer ? null , gstreamer ? null
, gst-plugins-base ? null , gst-plugins-base ? null
@ -53,7 +53,7 @@ in
buildInputs = buildInputs =
[ glib libxml2 ] [ glib libxml2 ]
++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enableUsb libusb1
++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optional enablePacketSocket audit
++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] ++ 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 ]; ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];