Merge pull request #233466 from alyssais/x264-cross

x264: fix cross compilation to x86_64
This commit is contained in:
Nick Cao 2023-05-22 20:22:54 -06:00 committed by GitHub
commit e9caabc335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) ''
preConfigure = lib.optionalString stdenv.hostPlatform.isx86 ''
# `AS' is set to the binutils assembler, but we need nasm
unset AS
'' + lib.optionalString stdenv.hostPlatform.isAarch ''