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

vulkan-loader: fix cross-compilation #171579

Merged
merged 1 commit into from
May 5, 2022

Conversation

Mindavi
Copy link
Contributor

@Mindavi Mindavi commented May 4, 2022

Description of changes

See issue KhronosGroup/Vulkan-Loader#881.

FIxup for update of vulkan(-loader): #170366.

Not 100% sure if this won't cause issues, but at least it fixes compilation for the package. It shouldn't change anything for the native build.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux (cross-compiled)
    • 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/)
  • Fits CONTRIBUTING.md.

cc @sgillespie

@Mindavi Mindavi added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label May 4, 2022
@sgillespie
Copy link
Contributor

This seems to fix vulkan-loader via:

 nix-build . --arg crossSystem '{ config = "aarch64-unknown-linux-gnu"; }' -A vulkan-loader

@Mindavi
Copy link
Contributor Author

Mindavi commented May 5, 2022

Hopefully this doesn't cause strange regresssions for cross, but this is the easiest solution for now, preventing having to build the native tools first and hacking up the build scripts.

@Mindavi Mindavi merged commit 8ac0f2c into NixOS:master May 5, 2022
@Mindavi Mindavi deleted the vulkan-loaders/cross branch May 5, 2022 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

2 participants