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

apmplanner2: fix build #57650

Merged
merged 1 commit into from Mar 14, 2019
Merged

apmplanner2: fix build #57650

merged 1 commit into from Mar 14, 2019

Conversation

stephengroat
Copy link
Contributor

see ArduPilot/apm_planner#1166

Motivation for this change

#56826

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veprbl
Copy link
Member

veprbl commented Mar 14, 2019

https://nixos.org/nixpkgs/manual/#ssec-qt-applications
You need to instead use libsForQt59.callPackage in the all-packages.nix

Upstream ticket suggests that this can be also fixed by simply applying this patch
https://github.com/Arne-W/apm_planner/commit/21c487a6b69ffed8f30cac32dd3238d978b67355.diff

@stephengroat
Copy link
Contributor Author

@veprbl thanks for the help!

i switched package in all-packages.nix, figuring it's probably better to just get the patch as part of the next release

@veprbl
Copy link
Member

veprbl commented Mar 14, 2019

In that case can you please leave a "TODO" comment somewhere in https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/science/robotics/apmplanner2/default.nix#L8 so we don't forget.

cc @wucke13 as maintainer

@veprbl
Copy link
Member

veprbl commented Mar 14, 2019

A comment to remind us to reinstate latest qt version on next release.

@stephengroat
Copy link
Contributor Author

@veprbl no worries, done

@veprbl
Copy link
Member

veprbl commented Mar 14, 2019

@GrahamcOfBorg build apmplanner2

@veprbl veprbl added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 14, 2019
@veprbl veprbl merged commit d5f97ae into NixOS:master Mar 14, 2019
@veprbl
Copy link
Member

veprbl commented Mar 14, 2019

Thank you!

edit: backported in 62e659a

@veprbl veprbl added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Mar 14, 2019
@stephengroat stephengroat deleted the patch-4 branch March 14, 2019 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants