Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 48271f8db9cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa2b9c9e99e4
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 4, 2020

  1. aravis: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
    @jtojnar
    jtojnar committed Apr 4, 2020
    Copy the full SHA
    aa2b9c9 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/aravis/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/aravis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];