From 2c07b247d3c544293bada8a671182b891d440d50 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 27 Aug 2025 18:44:48 +0200 Subject: [PATCH] ffmpeg: allways use nasm and not yasm ffmpeg recommends usig nasm and support for yasm was droped in 8.0 --- pkgs/development/libraries/ffmpeg/generic.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 2fb174f92bc0..9797f53c9284 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -9,7 +9,6 @@ perl, texinfo, texinfo6, - yasm, nasm, # You can fetch any upstream version using this derivation by specifying version and hash @@ -826,8 +825,7 @@ stdenv.mkDerivation ( perl pkg-config ] - # 8.0 is only compatible with nasm, and we don't want to rebuild all older ffmpeg builds at this moment. - ++ optionals stdenv.hostPlatform.isx86 (if versionOlder version "8.0" then [ yasm ] else [ nasm ]) + ++ optionals stdenv.hostPlatform.isx86 [ nasm ] # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle. ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ]) ++ optionals withCudaLLVM [ clang ]