make libusb1 dependencies explicit #85965
Conversation
|
cc @jtojnar |
flokli
force-pushed
the
libusb1-cleanups
branch
from
130ec6a to
7ff6966
Compare
|
I think we wanted to rename |
|
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 ]; | |||
There was a problem hiding this comment.
Looks like $dev/include/usbredirhost.h contains #include <libusb.h> so this might be still necessary but the .pc file is incorrect.
There was a problem hiding this comment.
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…
There was a problem hiding this comment.
I added libusb1 back to usbredir's propagatedBuildInputs.
|
Right, this makes sense. I will do the rename separately. |
|
Thanks! Feel free to fixup the |
Also, fix the website there, and tidy up the spice-gtk derivation, which makes use of libusb1 too.
flokli
force-pushed
the
libusb1-cleanups
branch
from
7ff6966 to
d0b9aa6
Compare
This is a stlink-specific detail, and doesn't need to be in top-level.nix
Motivation for this change
This moves the
libusb = libusb1aliases fromtop-level.nixto individual packages.These projects are libusb1-specific, and having these aliases in
top-level.nixonly makes things less readable.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)