diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-03-29 19:57:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 19:57:13 +0100 |
| commit | a8e19088da1aea79322f1bd411d01b288bf28ccd (patch) | |
| tree | 3db6ca15e5f58700fe99b4a5e9fb10b54d76774d /pkgs/development/libraries/ffmpeg | |
| parent | ebaa3c5bd1ae96d809e1380b74d635aea0b586f8 (diff) | |
| parent | de8f760fbd4d8895047c090516841d259b145719 (diff) | |
Merge pull request #54392 from ivan/nv-codec
ffmpeg, mpv: enable hardware-accelerated decoding with CUDA
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d11ef732a01f..72929e127bcc 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, x265, xvidcore, zlib, libopus, speex +, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers , openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex + libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optional openglSupport libGLU_combined ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM |