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

libX11: adds upstream patch to fix cross-compilation #69700

Merged
merged 1 commit into from Sep 28, 2019

Conversation

samueldr
Copy link
Member

With this patch applied, cross-compilation of a system image for ARM
platforms works as it did previously.

See their commit for more explanation:

Motivation for this change
Things done

☑️ Verified that it builds the nixos sd image using this configuration.

  • ☑️ 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 nix-review --run "nix-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.
Notify maintainers

cc @dtzWill author of the upgrade #68072

With this patch applied, cross-compilation of a system image for ARM
platforms works as it did previously.

See their commit for more explanation:

 * https://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=0327c427d62f671eced067c6d9b69f4e216a8cac
@worldofpeace
Copy link
Contributor

Seeing this commit in 19.09-beta 8d3d7ce.
Backport?

@samueldr
Copy link
Member Author

+1 for a backport to nixos-19.09-staging; this should make 19.09 a known relatively trivial target to cross-compile.

@worldofpeace
Copy link
Contributor

hmm, probably should check with ofborg cross compilation.

vcunat added a commit that referenced this pull request Sep 28, 2019
@vcunat vcunat merged commit 85f97f2 into NixOS:staging Sep 28, 2019
vcunat added a commit that referenced this pull request Sep 28, 2019
@samueldr samueldr deleted the cross/fix/libX11 branch September 28, 2019 17:17
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.

None yet

3 participants