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

x264: fix cross compilation #76914

Merged
merged 1 commit into from Jan 15, 2020
Merged

x264: fix cross compilation #76914

merged 1 commit into from Jan 15, 2020

Conversation

danielfullmer
Copy link
Contributor

Motivation for this change

Fix for cross compilation. Note that nasm is only needed for x86 targets.

Built on x86_64 and tested on raspberry pi 1 with pkgsCross.raspberryPi.x264.

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.
Notify maintainers

cc @spwhitt @tadeokondrak

@ofborg ofborg bot requested review from spwhitt and tadeokondrak January 4, 2020 01:52
@FRidh FRidh added this to WIP in Staging via automation Jan 6, 2020
@FRidh FRidh moved this from WIP to Needs review in Staging Jan 6, 2020
@FRidh FRidh changed the base branch from master to staging January 15, 2020 08:46
@FRidh FRidh merged commit 2e5051e into NixOS:staging Jan 15, 2020
Staging automation moved this from Needs review to Done Jan 15, 2020
alyssais added a commit to alyssais/nixpkgs that referenced this pull request May 22, 2023
@alyssais
x264: fix cross compilation to x86_64
b8b30df 
The PR that added this condition said[1]:

> Note that nasm is only needed for x86 targets.

This suggests to me that hostPlatform was always intended, and
using buildPlatform for x86_64 was a typo.  This change fixes cross
compilation from aarch64-linux to x86_64-linux.  I've also tested that
it doesn't break x86_64-linux -> aarch64-linux.

[1]: NixOS#76914
@alyssais alyssais mentioned this pull request May 22, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spwhitt spwhitt Awaiting requested review from spwhitt

@tadeokondrak tadeokondrak Awaiting requested review from tadeokondrak

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@danielfullmer @FRidh