diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-27 12:42:15 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-29 14:32:56 -0700 |
| commit | b07929b0a389541a7272deacbd305de2b48cce90 (patch) | |
| tree | 40231bbf06277769098feb79963733610a13fbd8 /pkgs/development/libraries/ffmpeg | |
| parent | cd52c044568bdf1108428698048a9af92dc0b625 (diff) | |
| download | nixlib-b07929b0a389541a7272deacbd305de2b48cce90.tar nixlib-b07929b0a389541a7272deacbd305de2b48cce90.tar.gz nixlib-b07929b0a389541a7272deacbd305de2b48cce90.tar.bz2 nixlib-b07929b0a389541a7272deacbd305de2b48cce90.tar.lz nixlib-b07929b0a389541a7272deacbd305de2b48cce90.tar.xz nixlib-b07929b0a389541a7272deacbd305de2b48cce90.tar.zst nixlib-b07929b0a389541a7272deacbd305de2b48cce90.zip | |
Use libpulseaudio instead of pulseaudio
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 13a339740f45..99d8fe679ab3 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 -, 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; |