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.

Sign up for GitHub

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

Jump to bottom

libusb-compat: fix up the .so so it can find libusb1 #82944

Merged
merged 1 commit into from Mar 21, 2020
Merged

libusb-compat: fix up the .so so it can find libusb1 #82944

merged 1 commit into from Mar 21, 2020

Conversation

peterhoeg
Copy link
Member

Motivation for this change

Applications using libusb-compat do not run after
#48434 as libusb-compat is no longer able
to find libusb1.

With this in place, g15daemon is running again.

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.

@peterhoeg
Copy link
Member Author

Cc: @infinisil & @lschuermann who worked on the referenced PR.

@peterhoeg peterhoeg mentioned this pull request Mar 19, 2020
Merged
10 tasks
@lschuermann
Copy link
Member

Thanks for pointing this out. Weird that it now requires setting the RPATH manually, I could've sworn to have tested libusb-compat with the old PR. However that was 2018, my brain may just confuse some things.

lschuermann
lschuermann approved these changes Mar 19, 2020
View reviewed changes
Copy link
Member

@lschuermann lschuermann left a comment

Choose a reason for hiding this comment

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

However this patch does make sense, I just tested with your g15daemon and both libusb-compat and libusb1 propagate through to the RPATH. I can't verify the functionality of g15daemon itself.

This has my go! I'd like to wait for @infinisil's comments though.

@peterhoeg peterhoeg changed the base branch from master to staging March 21, 2020 04:48
@peterhoeg
Copy link
Member Author

Thanks for looking into this @lschuermann. I'm merging this into staging due to the rebuilds.

@peterhoeg peterhoeg merged commit 438f094 into NixOS:staging Mar 21, 2020
@peterhoeg peterhoeg deleted the f/libusb branch March 28, 2020 13:20
@mmilata mmilata mentioned this pull request Mar 29, 2020
Closed
@jtojnar jtojnar mentioned this pull request Apr 24, 2020
Merged
10 tasks
jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Apr 28, 2020
@jtojnar
libusb: point alias to libusb1
45edbeb 
Until recently, libusb-compat propagated libusb1 and many packages unknowingly used it to obtain libusb1.
When NixOS#82944 removed this evil propagation, it broke many packages with such incorrect assumption.
This patch trades the breakage of packages wanting libusb1 caused by the PR for a hopefully less common breakage of the packages relying on the compat library.
@jtojnar jtojnar mentioned this pull request Apr 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lschuermann lschuermann lschuermann approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@peterhoeg @lschuermann