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: 71278aef73c7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0851f48a0228
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 4, 2020

  1. uhubctl: 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
    38ed5c6 View commit details

  2. utsushi: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
    @jtojnar
    jtojnar committed Apr 4, 2020

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    0851f48 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/misc/drivers/utsushi/default.nix
  2. +2 −2 pkgs/tools/misc/uhubctl/default.nix
4 changes: 2 additions & 2 deletions pkgs/misc/drivers/utsushi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2
, imagemagick, sane-backends, tesseract4, udev, libusb}:
, imagemagick, sane-backends, tesseract4, udev, libusb1}:

stdenv.mkDerivation rec {
pname = "utsushi";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
imagemagick
sane-backends
udev.dev
libusb.dev
libusb1.dev
];

NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable";
4 changes: 2 additions & 2 deletions pkgs/tools/misc/uhubctl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv
, fetchFromGitHub
, libusb
, libusb1
}:

stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq";
};

buildInputs = [ libusb ];
buildInputs = [ libusb1 ];

installFlags = [ "prefix=${placeholder "out"}" ];
meta = with stdenv.lib; {