diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-05-22 20:22:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 20:22:54 -0600 |
| commit | e9caabc335085a18bf60b8e1f5d2bd112b7d7242 (patch) | |
| tree | 41f7778bc16034e535a5fdf2e44381d31aeb3820 /pkgs | |
| parent | d3237d4abd9e849245157ea9168f3cdddcc16464 (diff) | |
| parent | b8b30dff6eb2a3a3945d86c74808e44e23b36d51 (diff) | |
| download | nixpkgs-e9caabc335085a18bf60b8e1f5d2bd112b7d7242.tar nixpkgs-e9caabc335085a18bf60b8e1f5d2bd112b7d7242.tar.gz nixpkgs-e9caabc335085a18bf60b8e1f5d2bd112b7d7242.tar.bz2 nixpkgs-e9caabc335085a18bf60b8e1f5d2bd112b7d7242.tar.lz nixpkgs-e9caabc335085a18bf60b8e1f5d2bd112b7d7242.tar.xz nixpkgs-e9caabc335085a18bf60b8e1f5d2bd112b7d7242.tar.zst nixpkgs-e9caabc335085a18bf60b8e1f5d2bd112b7d7242.zip | |
Merge pull request #233466 from alyssais/x264-cross
x264: fix cross compilation to x86_64
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/x264/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index da343016f33..e5ca1fc58ed 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -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 '' |