From 817b0e1338faca6deebeb9fca8beeef8409dbeea Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Wed, 13 May 2026 23:00:47 +0300 Subject: [PATCH] ffmpeg: use unwrapped clang for cuda-llvm support The build system retargets clang for the appropriate nvidia arch and doesn't depend on anything from the wrappers. Since the wrappped compiler sets the flags for the original arch, it now includes `-mtls-dialect=gnu2` on x86_64, which is not a supported flag for the retargeted clang. --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index b1f682050f21..26b365ad17de 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -841,7 +841,7 @@ stdenv.mkDerivation ( ++ optionals stdenv.hostPlatform.isx86 [ nasm ] # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle. ++ optionals (lib.versionAtLeast version "6") [ texinfo ] - ++ optionals withCudaLLVM [ clang ] + ++ optionals withCudaLLVM [ clang.cc ] ++ optionals withCudaNVCC [ cuda_nvcc ]; buildInputs =