Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hidapi: fix cross build #108025

Closed
wants to merge 1 commit into from
Closed

hidapi: fix cross build #108025

wants to merge 1 commit into from

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Dec 31, 2020

Motivation for this change

Running ofborg to assess the amount of rebuilds. Might need to make this a cross-only patch.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@FRidh FRidh requested a review from flokli December 31, 2020 08:31
@FRidh FRidh mentioned this pull request Dec 31, 2020
10 tasks
@@ -1,5 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb1
{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, udev, libusb1

nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [
autoreconfHook
pkgconfig
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pkgconfig
pkg-config

Comment on lines 23 to 24
buildInputs = [ ]
++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
buildInputs = [ ]
++ stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ];

@FRidh
Copy link
Member Author

FRidh commented Dec 31, 2020

ok, this needs to be added conditionally

@FRidh
Copy link
Member Author

FRidh commented Dec 31, 2020

pushed f651423 to staging-next

@FRidh FRidh closed this Dec 31, 2020
@alyssais
Copy link
Member

Thanks for the fix.

@flokli
Copy link
Contributor

flokli commented Dec 31, 2020

I pushed a cleanup PR on top, making this not only conditional on cross in #108044, and addressing the PR feedback.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants