mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-04 11:37:19 +03:00
Merge pull request #220327 from misuzu/ffmpeg-armv7l
ffmpeg: fix configure errors on native armv7l-linux
This commit is contained in:
commit
07fba224fa
@ -34,7 +34,7 @@
|
|||||||
, withCaca ? withFullDeps # Textual display (ASCII art)
|
, withCaca ? withFullDeps # Textual display (ASCII art)
|
||||||
, withCelt ? withFullDeps # CELT decoder
|
, withCelt ? withFullDeps # CELT decoder
|
||||||
, withCrystalhd ? withFullDeps
|
, withCrystalhd ? withFullDeps
|
||||||
, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !isAarch64))
|
, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch))
|
||||||
, withCudaLLVM ? withFullDeps
|
, withCudaLLVM ? withFullDeps
|
||||||
, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
|
, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
|
||||||
, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394)
|
, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394)
|
||||||
@ -57,8 +57,8 @@
|
|||||||
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
|
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
|
||||||
, withMp3lame ? withHeadlessDeps # LAME MP3 encoder
|
, withMp3lame ? withHeadlessDeps # LAME MP3 encoder
|
||||||
, withMysofa ? withFullDeps # HRTF support via SOFAlizer
|
, withMysofa ? withFullDeps # HRTF support via SOFAlizer
|
||||||
, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform
|
, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32
|
||||||
, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform
|
, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32
|
||||||
, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora
|
, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora
|
||||||
, withOpenal ? withFullDeps # OpenAL 1.1 capture support
|
, withOpenal ? withFullDeps # OpenAL 1.1 capture support
|
||||||
, withOpencl ? withFullDeps
|
, withOpencl ? withFullDeps
|
||||||
|
Loading…
Reference in New Issue
Block a user