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

hidapi: request libusb1 directly

Browse Source
This commit is contained in:
Florian Klink 2020-04-24 23:37:45 +02:00
parent e726e341c6
commit eac6c63db1
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1
, darwin }: , darwin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ ] buildInputs = [ ]
++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ]; ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View File

@ -12141,9 +12141,7 @@ in
heyefi = haskellPackages.heyefi; heyefi = haskellPackages.heyefi;
hidapi = callPackage ../development/libraries/hidapi { hidapi = callPackage ../development/libraries/hidapi { };
libusb = libusb1;
};
highfive = callPackage ../development/libraries/highfive { }; highfive = callPackage ../development/libraries/highfive { };