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

libdrm: fix cross-compile to x86 #111282

Merged
merged 1 commit into from Feb 26, 2021
Merged

libdrm: fix cross-compile to x86 #111282

merged 1 commit into from Feb 26, 2021

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Jan 30, 2021

Don't omit drm_intel when cross-compiling.

We've had this switch since ca5d91a and it doesn't seem to be needed anymore.

https://hydra.nixos.org/eval/1644952?filter=x86_64-musl.mesa#tabs-still-fail

Motivation for this change
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.

@r-burns
libdrm: fix cross-compile to x86
d88318e 
Don't omit drm_intel when cross-compiling.

We've had this switch since
ca5d91a
and it doesn't seem to be needed anymore.

https://hydra.nixos.org/eval/1644952?filter=x86_64-musl.mesa#tabs-still-fail
@r-burns
Copy link
Contributor Author

r-burns commented Jan 30, 2021

Despite the title, this can be tested on x86 because compiling to musl is considered cross-compiling. So pkgsCross.musl64.mesa is a reproducer. N.B., mesa proceeds further but still does not succeed; there are other issues with mesa itself I have not addressed here.

@r-burns r-burns added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Feb 20, 2021
@symphorien symphorien merged commit b12abe6 into NixOS:master Feb 26, 2021
@r-burns r-burns deleted the libdrm-cross branch February 26, 2021 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@r-burns @symphorien