Merge pull request #33753 from gnidorah/avidemux

avidemux: support alsa
This commit is contained in:
Jörg Thalheim 2018-01-13 17:42:23 +00:00 committed by GitHub
commit 4acd2f1a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir { stdenv, lib, fetchurl, cmake, pkgconfig, lndir
, zlib, gettext, libvdpau, libva, libXv, sqlite , zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi, gtk3, qt4 , yasm, freetype, fontconfig, fribidi, gtk3, qt4
, alsaLib
, withX265 ? true, x265 , withX265 ? true, x265
, withX264 ? true, x264 , withX264 ? true, x264
, withXvid ? true, xvidcore , withXvid ? true, xvidcore
@ -29,7 +30,7 @@ let
enableParallelBuilding = false; enableParallelBuilding = false;
nativeBuildInputs = [ cmake pkgconfig yasm ]; nativeBuildInputs = [ cmake pkgconfig yasm ];
buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype ] buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype alsaLib ]
++ lib.optional withX264 x264 ++ lib.optional withX264 x264
++ lib.optional withX265 x265 ++ lib.optional withX265 x265
++ lib.optional withXvid xvidcore ++ lib.optional withXvid xvidcore