diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-10-30 09:16:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 09:16:18 +0100 |
| commit | 5c1c90a9ada2e5967f30f68d5b5d8802a542aad6 (patch) | |
| tree | eddb5ecc5704259011a1d82f4fbb0c86eccacc1b /pkgs/development | |
| parent | 2f9fc897eb305abee1206061a20f65c12243b0b4 (diff) | |
| parent | b79dc80b2f57db784589deb773feb097f14b2e3a (diff) | |
| download | nixlib-5c1c90a9ada2e5967f30f68d5b5d8802a542aad6.tar nixlib-5c1c90a9ada2e5967f30f68d5b5d8802a542aad6.tar.gz nixlib-5c1c90a9ada2e5967f30f68d5b5d8802a542aad6.tar.bz2 nixlib-5c1c90a9ada2e5967f30f68d5b5d8802a542aad6.tar.lz nixlib-5c1c90a9ada2e5967f30f68d5b5d8802a542aad6.tar.xz nixlib-5c1c90a9ada2e5967f30f68d5b5d8802a542aad6.tar.zst nixlib-5c1c90a9ada2e5967f30f68d5b5d8802a542aad6.zip | |
Merge pull request #49389 from colemickens/ffmpeg
ffmpeg: enable libdrm
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7c3b3447d613..d11ef732a01f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr +, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex , openglSupport ? false, libGLU_combined ? null # Build options @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { "--enable-libtheora" (ifMinVer "2.1" "--enable-libssh") (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) + (ifMinVer "3.4" (enableFeature vaapiSupport "libdrm")) "--enable-vdpau" "--enable-libvorbis" (ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) @@ -165,6 +166,7 @@ stdenv.mkDerivation rec { ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau |