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-full | |
| 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-full')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index fd5ca0545a3b..aee67f5cd770 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -108,7 +108,7 @@ #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null -, pulseaudio ? null # Pulseaudio input support +, libpulseaudio ? null # Pulseaudio input support , rtmpdump ? null # RTMP[E] support #, libquvi ? null # Quvi input support , samba ? null # Samba protocol @@ -361,7 +361,7 @@ stdenv.mkDerivation rec { #(enableFeature (openh264 != null) "openh264") (enableFeature (openjpeg_1 != null) "libopenjpeg") (enableFeature (opensslExtlib && gplLicensing) "openssl") - (enableFeature (pulseaudio != null) "libpulse") + (enableFeature (libpulseaudio != null) "libpulse") #(enableFeature quvi "libquvi") (enableFeature (rtmpdump != null) "librtmp") #(enableFeature (schroedinger != null) "libschroedinger") @@ -399,7 +399,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXext libXfixes libXv lzma openal openjpeg_1 pulseaudio rtmpdump + libxcb libXext libXfixes libXv lzma openal openjpeg_1 libpulseaudio rtmpdump samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib mesa ++ optionals x11grabExtlib [ libXext libXfixes ] |