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

raspberrypi-tools: fix build on x86_64-linux #107689

Merged
merged 1 commit into from Dec 27, 2020
Merged

raspberrypi-tools: fix build on x86_64-linux #107689

merged 1 commit into from Dec 27, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Dec 27, 2020 •
edited

This allows using tools such as dtmerge on x86_64-linux.

Motivated by kwohlfahrt@7ba456e.

Motivation for this change

Use dtmerge on x86_64-linux (while cross-compiling raspberry pi images)

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.

@flokli
raspberrypi-tools: fix build on x86_64-linux
b1fb82e 
This allows using tools such as dtmerge on x86_64-linux.
lovesegfault
lovesegfault approved these changes Dec 27, 2020
View reviewed changes
Copy link
Member

@lovesegfault lovesegfault left a comment

Choose a reason for hiding this comment

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

LGTM, maybe add a note that if the upstream PR gets merge the patch can be dropped?

@ofborg ofborg bot requested a review from tavyc December 27, 2020 02:42
@flokli
Copy link
Contributor Author

flokli commented Dec 27, 2020 •
edited

This links to the PR already, and on a bump, the patch will fail to apply (and patch will say it already is applied). I assume this is fine (?)

@Mic92 Mic92 merged commit a945fdb into NixOS:master Dec 27, 2020
@flokli flokli deleted the raspberrypi-tools-build-x86_64-linux branch December 27, 2020 13:31
@flokli flokli mentioned this pull request Dec 30, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovesegfault lovesegfault lovesegfault approved these changes

@samueldr samueldr Awaiting requested review from samueldr

@dezgeg dezgeg Awaiting requested review from dezgeg

@kwohlfahrt kwohlfahrt Awaiting requested review from kwohlfahrt

@tavyc tavyc Awaiting requested review from tavyc

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @lovesegfault @Mic92