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

make libusb1 dependencies explicit #85965

Merged
merged 9 commits into from Apr 27, 2020
Merged

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Apr 24, 2020

Motivation for this change

This moves the libusb = libusb1aliases from top-level.nix to individual packages.
These projects are libusb1-specific, and having these aliases in top-level.nix only makes things less readable.

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.

@worldofpeace
Copy link
Contributor

cc @jtojnar

@jtojnar
Copy link
Contributor

jtojnar commented Apr 24, 2020

I think we wanted to rename libusblibusb-compat and libusb1libusb to reduce the fallback from #82944.

@ofborg ofborg bot requested a review from xeji April 24, 2020 22:19
@flokli
Copy link
Contributor Author

flokli commented Apr 24, 2020

I was mostly annoyed by the "local aliasing" inside top-level.nix, and pushed this down to individual derivations. I'm not aware of these renames. Happy to close this PR, if it's obsolete.

@@ -12,14 +12,13 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error";

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb ];
propagatedBuildInputs = [ libusb ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like $dev/include/usbredirhost.h contains #include <libusb.h> so this might be still necessary but the .pc file is incorrect.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

but shouldn't we still explicitly configure these dependencies where required? With propagatedBuildInputs being set, we didn't notice we were missing it from spice-gtk

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added libusb1 back to usbredir's propagatedBuildInputs.

@jtojnar
Copy link
Contributor

jtojnar commented Apr 24, 2020

Right, this makes sense. I will do the rename separately.

@flokli
Copy link
Contributor Author

flokli commented Apr 24, 2020

Thanks! Feel free to fixup the usbredir commit as you see fit :-)

Also, fix the website there, and tidy up the spice-gtk derivation, which
makes use of libusb1 too.
@flokli flokli merged commit 3b1e189 into NixOS:master Apr 27, 2020
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

3 participants