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

rav1e: use libgit2 from Nixpkgs #212597

Merged
merged 1 commit into from
Jan 29, 2023
Merged

rav1e: use libgit2 from Nixpkgs #212597

merged 1 commit into from
Jan 29, 2023

Conversation

alyssais
Copy link
Member

Description of changes

This is a native build input because it's used at build time by the "built" crate, which tries to embed git info and build timestamps into the binary (ugh).

This fixes cross-compilation from x86_64 to aarch64, because git2's build.rs tries to use -m64, which is x86_64-only.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • 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/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@alyssais alyssais added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jan 25, 2023
This is a native build input because it's used at build time by the
"built" crate, which tries to embed git info and build timestamps into
the binary (ugh).

This fixes cross-compilation from x86_64 to aarch64, because git2's
build.rs tries to use -m64, which is x86_64-only.
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Jan 25, 2023
@NickCao
Copy link
Member

NickCao commented Jan 26, 2023

@ofborg eval

@NickCao
Copy link
Member

NickCao commented Jan 26, 2023

Confirms this fixes cross build from x86_64-linux to riscv64-linux too.

@NickCao
Copy link
Member

NickCao commented Jan 26, 2023

@ofborg build pkgsCross.aarch64-multiplatform.rav1e

@alyssais alyssais merged commit 212c28e into NixOS:master Jan 29, 2023
@alyssais alyssais deleted the rav1e-cross branch January 29, 2023 10:48
@cole-h cole-h removed the ofborg-internal-error Ofborg encountered an error label Jan 30, 2023
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 platform than they will be used on 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants