x264: unset AS for aarch32 as well #86574
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
prusnak
requested changes
May 2, 2020
| @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| outputs = [ "out" "lib" "dev" ]; | |||
|
|
|||
| preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) '' | |||
| preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isAarch32) '' | |||
| # `AS' is set to the binutils assembler, but we need nasm | |||
| unset AS | |||
| '' + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) '' | |||
There was a problem hiding this comment.
Should we remove stdenv.hostPlatform.isAarch32 from this code branch if it is already handled above?
Or is that intended?
There was a problem hiding this comment.
Looks like it's not even needed, I've picked this from older tree and didn't notice it was fixed few lines bellow as I didn't get any conflicts :) Good catch!
|
Already fixed in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fixes
armv7lbuild.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)Checked with
nix-build --check -A pkgs.x264