diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2023-07-09 16:46:17 +0200 |
|---|---|---|
| committer | Francesco Gazzetta <fgaz@fgaz.me> | 2023-07-09 16:49:03 +0200 |
| commit | 01693fd5e8fd2c18d5bb8b14bab802f4a1550763 (patch) | |
| tree | bc5b681bb3f881932f72392f69d0c83e236b54d5 /pkgs/development/libraries/ffmpeg/generic.nix | |
| parent | f6dc216ee26c2e92558992074c81148f7f500ba3 (diff) | |
| download | nixpkgs-01693fd5e8fd2c18d5bb8b14bab802f4a1550763.tar nixpkgs-01693fd5e8fd2c18d5bb8b14bab802f4a1550763.tar.gz nixpkgs-01693fd5e8fd2c18d5bb8b14bab802f4a1550763.tar.bz2 nixpkgs-01693fd5e8fd2c18d5bb8b14bab802f4a1550763.tar.lz nixpkgs-01693fd5e8fd2c18d5bb8b14bab802f4a1550763.tar.xz nixpkgs-01693fd5e8fd2c18d5bb8b14bab802f4a1550763.tar.zst nixpkgs-01693fd5e8fd2c18d5bb8b14bab802f4a1550763.zip | |
ffmpeg: fix configure errors on native riscv
Like #220327, this fixes the following errors: ERROR: cuda requested, but not all dependencies are satisfied: ffnvcodec ERROR: cuvid requested, but not all dependencies are satisfied: ffnvcodec ERROR: nvenc requested, but not all dependencies are satisfied: ffnvcodec
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7e11c60beb0..147d5b9fe04 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -34,7 +34,7 @@ , withCaca ? withFullDeps # Textual display (ASCII art) , withCelt ? withFullDeps # CELT decoder , withCrystalhd ? withFullDeps -, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch)) +, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch && !hostPlatform.isRiscV)) , withCudaLLVM ? withFullDeps , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) @@ -58,8 +58,8 @@ , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer -, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 -, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 +, withNvdec ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) +, withNvenc ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV) , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpencl ? withFullDeps |