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

subsurface: add dependencies for transports #222037

Merged

Conversation

m-burg
Copy link
Contributor

@m-burg m-burg commented Mar 19, 2023

The version of libdivecomputer that subsurface uses was built without libraries it needs for transports, this made it impossible to import dives from a dive computer over USB.

Description of changes
  • add pkg-config to nativeBuildInputs of libdivecomputer
  • add bluez, libusb1, and hidapi to `buildInputs of libdivecomputer

I tested USB connectivity with a Scubapro G2 and was able to import dives from it. Unfortunately my laptop is too old to test the bluetooth side of things. I am not sure which devices uses HIDAPI.

Is this something that can be backported into 22.11?

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

The version of libdivecomputer that subsurface uses was built without
libraries it needs for transports, this made it impossible to import
dives from a dive computer over USB.
@adisbladis
Copy link
Member

Unfortunately my laptop is too old to test the bluetooth side of things.

Bluetooth has worked for me in the past with my Shearwater Petrel.
It's probably been propagated by some other package and ends up working that way, either way it doesn't hurt to be explicit about adding it to the build.

@github-actions
Copy link
Contributor

Successfully created backport PR for release-22.11:

@m-burg
Copy link
Contributor Author

m-burg commented Mar 20, 2023

Bluetooth has worked for me in the past with my Shearwater Petrel. It's probably been propagated by some other package and ends up working that way, either way it doesn't hurt to be explicit about adding it to the build.

Subsurface has bluez in its build inputs and doesn't build when I remove it, maybe that's why.

@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 13, 2023
@github-actions
Copy link
Contributor

Backport failed for release-22.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-22.11
git worktree add -d .worktree/backport-222037-to-release-22.11 origin/release-22.11
cd .worktree/backport-222037-to-release-22.11
git checkout -b backport-222037-to-release-22.11
ancref=$(git merge-base 7f55ff0b2104d2867b88ffe1784b595aace3ff0f af4e12adb785c10892c61a1244bf86694c82782d)
git cherry-pick -x $ancref..af4e12adb785c10892c61a1244bf86694c82782d

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.

3 participants