diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-01-13 17:42:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 17:42:23 +0000 |
| commit | 4acd2f1a90a75967141255de2107eff3cfb3963c (patch) | |
| tree | fdea7ce1a9e737085914fe5360d46c41850bf7ce /pkgs/applications/video | |
| parent | 87677d039010d28b26e581062878c37b5010af39 (diff) | |
| parent | 18af8dabab9935985600c3d4a36942d93b06f67c (diff) | |
Merge pull request #33753 from gnidorah/avidemux
avidemux: support alsa
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/avidemux/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 7f70818bb141a..76b42acef3e15 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, alsaLib , withX265 ? true, x265 , withX264 ? true, x264 , withXvid ? true, xvidcore @@ -29,7 +30,7 @@ let enableParallelBuilding = false; 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 withX265 x265 ++ lib.optional withXvid xvidcore |