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 | |
parent | cd52c044568bdf1108428698048a9af92dc0b625 (diff) |
Use libpulseaudio instead of pulseaudio
Diffstat (limited to 'pkgs')
87 files changed, 184 insertions, 194 deletions
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index b27ac0586025..d45ab8182731 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, libpulseaudio, xlibs }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + alsaLib jack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext xlibs.xproto ]; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; -}
\ No newline at end of file +} diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index fd252754d660..a5cfdf227bb3 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, pulseaudio}: +{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}: stdenv.mkDerivation rec { name = "cmus-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue pulseaudio ]; + buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ]; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 64f3f3586a36..693d8e2a6e50 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, libsndfile, flex, bison , alsaLib ? null -, pulseaudio ? null +, libpulseaudio ? null , tcltk ? null # maybe csound can be compiled with support for those, see configure output @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m"; }; - buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; + buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; meta = { description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index ca8ce453e63d..9dd4db684326 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -18,7 +18,7 @@ , osdSupport ? true, dbus ? null # output plugins , alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, pulseaudio ? null +, pulseSupport ? true, libpulseaudio ? null # effect plugins , resamplerSupport ? true, libsamplerate ? null , overloadSupport ? true, zlib ? null @@ -41,7 +41,7 @@ assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; assert osdSupport -> dbus != null; assert alsaSupport -> alsaLib != null; -assert pulseSupport -> pulseaudio != null; +assert pulseSupport -> libpulseaudio != null; assert resamplerSupport -> libsamplerate != null; assert overloadSupport -> zlib != null; assert wavpackSupport -> wavpack != null; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ++ optional hotkeysSupport libX11 ++ optional osdSupport dbus ++ optional alsaSupport alsaLib - ++ optional pulseSupport pulseaudio + ++ optional pulseSupport libpulseaudio ++ optional resamplerSupport libsamplerate ++ optional overloadSupport zlib ++ optional wavpackSupport wavpack diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index dd9b830be841..78383eec9539 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libsndfile, pulseaudio +, libsndfile, libpulseaudio }: let @@ -35,5 +35,5 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsndfile pulseaudio ]; + buildInputs = [ libsndfile libpulseaudio ]; } diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 5a4793a09c19..8e80992d7cad 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: + libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { version = "3.22.02"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio - libsndfile libsamplerate pulseaudio pkgconfig alsaLib ]; + libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; meta = { description = "Digital modem program"; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8cba482194e5..339cccfca704 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig -, pulseaudio }: +, libpulseaudio }: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-framework CoreAudio"; buildInputs = [ glib libsndfile pkgconfig ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ]; + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio jack2 ]; meta = with stdenv.lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 6d28c038f232..830d42eb91b0 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth , fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig -, pulseaudio, qt4, freetype +, libpulseaudio, qt4, freetype }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2 - libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4 + libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index a1e81be3cb37..0234a1d3fe5b 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }: +, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }: stdenv.mkDerivation rec { name = "mhwaveedit-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile - pkgconfig pulseaudio + pkgconfig libpulseaudio ]; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 6f2bf8cdb1c7..af4e887d1677 100644 --- a/pkgs/applications/audio/minimodem/default.nix +++ b/pkgs/applications/audio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }: +{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, linbpulseaudio }: stdenv.mkDerivation rec { version = "0.19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; }; - buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ]; + buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; meta = { description = "General-purpose software audio FSK modem"; |