public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use libpulseaudio instead of pulseaudio

Browse Source
This commit is contained in:
William A. Kennington III
2015-05-27 12:42:15 -07:00
parent cd52c04456
commit b07929b0a3
87 changed files with 184 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg/generic.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, pulseaudio, SDL, soxr
, libtheora, libva, libvdpau, libvorbis, libvpx, lzma, libpulseaudio, SDL, soxr
, x264, xvidcore, zlib
, openglSupport ? false, mesa ? null
# Build options
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib
] ++ optional openglSupport mesa
++ optionals (!isDarwin) [ libvpx pulseaudio ] # Need to be fixed on Darwin
++ optionals (!isDarwin) [ libvpx libpulseaudio ] # Need to be fixed on Darwin
++ optional (isLinux || isFreeBSD) libva
++ optional isLinux alsaLib;