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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/bristol/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }: { stdenv, fetchurl, alsaLib, jack2, pkgconfig, libpulseaudio, xlibs }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bristol-${version}"; name = "bristol-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext alsaLib jack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext
xlibs.xproto xlibs.xproto
]; ];
@ -26,4 +26,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ]; maintainers = [ maintainers.goibhniu ];
}; };
} }

4
pkgs/applications/audio/cmus/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "cmus-${version}"; name = "cmus-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
configurePhase = "./configure prefix=$out"; 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 = { meta = {
description = "Small, fast and powerful console music player for Linux and *BSD"; description = "Small, fast and powerful console music player for Linux and *BSD";

4
pkgs/applications/audio/csound/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, libsndfile, flex, bison { stdenv, fetchurl, cmake, libsndfile, flex, bison
, alsaLib ? null , alsaLib ? null
, pulseaudio ? null , libpulseaudio ? null
, tcltk ? null , tcltk ? null
# maybe csound can be compiled with support for those, see configure output # maybe csound can be compiled with support for those, see configure output
@ -21,7 +21,7 @@ stdenv.mkDerivation {
sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m"; sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m";
}; };
buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ];
meta = { meta = {
description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";

6
pkgs/applications/audio/deadbeef/default.nix
View File

@ -18,7 +18,7 @@
, osdSupport ? true, dbus ? null , osdSupport ? true, dbus ? null
# output plugins # output plugins
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, pulseSupport ? true, pulseaudio ? null , pulseSupport ? true, libpulseaudio ? null
# effect plugins # effect plugins
, resamplerSupport ? true, libsamplerate ? null , resamplerSupport ? true, libsamplerate ? null
, overloadSupport ? true, zlib ? null , overloadSupport ? true, zlib ? null
@ -41,7 +41,7 @@ assert artworkSupport -> imlib2 != null;
assert hotkeysSupport -> libX11 != null; assert hotkeysSupport -> libX11 != null;
assert osdSupport -> dbus != null; assert osdSupport -> dbus != null;
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert resamplerSupport -> libsamplerate != null; assert resamplerSupport -> libsamplerate != null;
assert overloadSupport -> zlib != null; assert overloadSupport -> zlib != null;
assert wavpackSupport -> wavpack != null; assert wavpackSupport -> wavpack != null;
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
++ optional hotkeysSupport libX11 ++ optional hotkeysSupport libX11
++ optional osdSupport dbus ++ optional osdSupport dbus
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional pulseSupport pulseaudio ++ optional pulseSupport libpulseaudio
++ optional resamplerSupport libsamplerate ++ optional resamplerSupport libsamplerate
++ optional overloadSupport zlib ++ optional overloadSupport zlib
++ optional wavpackSupport wavpack ++ optional wavpackSupport wavpack

4
pkgs/applications/audio/ekho/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, libsndfile, pulseaudio , libsndfile, libpulseaudio
}: }:
let let
@ -35,5 +35,5 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libsndfile pulseaudio ]; buildInputs = [ libsndfile libpulseaudio ];
} }

4
pkgs/applications/audio/fldigi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile, { stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile,
libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.22.02"; version = "3.22.02";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
libsndfile libsamplerate pulseaudio pkgconfig alsaLib ]; libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ];
meta = { meta = {
description = "Digital modem program"; description = "Digital modem program";

4
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig { stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig
, pulseaudio }: , libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fluidsynth-${version}"; name = "fluidsynth-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"-framework CoreAudio"; "-framework CoreAudio";
buildInputs = [ glib libsndfile pkgconfig ] buildInputs = [ glib libsndfile pkgconfig ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ]; ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio jack2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications"; description = "Real-time software synthesizer based on the SoundFont 2 specifications";

4
pkgs/applications/audio/lmms/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
, fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig , fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig
, pulseaudio, qt4, freetype , libpulseaudio, qt4, freetype
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2 SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2
libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4 libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/audio/mhwaveedit/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH { stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }: , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mhwaveedit-${version}"; name = "mhwaveedit-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile
pkgconfig pulseaudio pkgconfig libpulseaudio
]; ];
configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa";

4
pkgs/applications/audio/minimodem/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }: { stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, linbpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.19"; version = "0.19";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g"; sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
}; };
buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ]; buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
meta = { meta = {
description = "General-purpose software audio FSK modem"; description = "General-purpose software audio FSK modem";

4
pkgs/applications/audio/pamixer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, pulseaudio }: { stdenv, fetchurl, boost, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4"; sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4";
}; };
buildInputs = [ boost pulseaudio ]; buildInputs = [ boost libpulseaudio ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

4
pkgs/applications/audio/paprefs/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libglademm { fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm
, dbus_glib, gconfmm, intltool }: , dbus_glib, gconfmm, intltool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
}; };
buildInputs = [ pulseaudio gtkmm libglademm dbus_glib gconfmm ]; buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/applications/audio/pavucontrol/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 { fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3
, libcanberra_gtk3, makeWrapper, gnome3 }: , libcanberra_gtk3, makeWrapper, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
''; '';
buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper buildInputs = [ libpulseaudio gtkmm3 libcanberra_gtk3 makeWrapper
gnome3.defaultIconTheme ]; gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/applications/audio/projectm/default.nix
View File

@ -3,7 +3,7 @@
, withQt ? true, qt4 , withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL , withLibvisual ? false, libvisual, SDL
, withJack ? false, jack2 , withJack ? false, jack2
, withPulseAudio ? true, pulseaudio , withPulseAudio ? true, libpulseaudio
}: }:
assert withJack -> withQt; assert withJack -> withQt;
@ -46,6 +46,6 @@ stdenv.mkDerivation {
++ optional withQt qt4 ++ optional withQt qt4
++ optionals withLibvisual [ libvisual SDL ] ++ optionals withLibvisual [ libvisual SDL ]
++ optional withJack jack2 ++ optional withJack jack2
++ optional withPulseAudio pulseaudio ++ optional withPulseAudio libpulseaudio
; ;
} }

4
pkgs/applications/audio/qmmp/default.nix
View File

@ -5,7 +5,7 @@
, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
# output plugins # output plugins
, alsaLib, pulseaudio , alsaLib, libpulseaudio
# effect plugins # effect plugins
, libsamplerate , libsamplerate
}: }:
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
# output plugins # output plugins
alsaLib pulseaudio alsaLib libpulseaudio
# effect plugins # effect plugins
libsamplerate libsamplerate
]; ];

4
pkgs/applications/audio/sonic-visualiser/default.nix
View File

@ -2,7 +2,7 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo { stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkgconfig, pulseaudio, qt5, redland , libsndfile, pkgconfig, libpulseaudio, qt5, redland
, rubberband, serd, sord, vampSDK , rubberband, serd, sord, vampSDK
}: }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# optional # optional
jack2 jack2
# portaudio # portaudio
pulseaudio libpulseaudio
libmad libmad
libogg # ? libogg # ?
# fishsound # fishsound

6
pkgs/applications/misc/gqrx/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr { stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr
# drivers (optional): # drivers (optional):
, rtl-sdr , rtl-sdr
, pulseaudioSupport ? true, pulseaudio , pulseaudioSupport ? true, libpulseaudio
}: }:
assert pulseaudioSupport -> pulseaudio != null; assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gqrx-${version}"; name = "gqrx-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
qt4 gnuradio boost gnuradio-osmosdr rtl-sdr qt4 gnuradio boost gnuradio-osmosdr rtl-sdr
] ++ stdenv.lib.optionals pulseaudioSupport [ pulseaudio ]; ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
configurePhase = ''qmake PREFIX="$out"''; configurePhase = ''qmake PREFIX="$out"'';

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -26,7 +26,7 @@
, gnomeKeyringSupport ? false, libgnome_keyring3 ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null
, proprietaryCodecs ? true , proprietaryCodecs ? true
, cupsSupport ? true , cupsSupport ? true
, pulseSupport ? false, pulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
, hiDPISupport ? false , hiDPISupport ? false
, source , source
@ -118,7 +118,7 @@ let
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux ++ optional enableSELinux libselinux
++ optionals cupsSupport [ libgcrypt cups ] ++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport pulseaudio; ++ optional pulseSupport libpulseaudio;
# XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to
# be fixed, then try again to unbundle everything into separate # be fixed, then try again to unbundle everything into separate

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -31,7 +31,7 @@
, nss , nss
, pango , pango
, heimdal , heimdal
, pulseaudio , libpulseaudio
, systemd , systemd
}: }:
@ -103,7 +103,7 @@ stdenv.mkDerivation {
nss nss
pango pango
heimdal heimdal
pulseaudio libpulseaudio
systemd systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [ ] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.cc stdenv.cc.cc

4
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl , libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
, dbus_glib, alsaLib, pulseaudio, udev, pango , dbus_glib, alsaLib, libpulseaudio, udev, pango
}: }:
with stdenv.lib; with stdenv.lib;
@ -34,7 +34,7 @@ let
xorg.libXrandr xorg.libXrandr
stdenv.cc.cc stdenv.cc.cc
alsaLib alsaLib
pulseaudio libpulseaudio
dbus_glib dbus_glib
udev udev
curl curl

2
pkgs/applications/networking/instant-messengers/oneteam/default.nix
View File

@ -1,6 +1,6 @@
x@{builderDefsPackage x@{builderDefsPackage
, fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
, pulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto , libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
, ...}: , ...}:
builderDefsPackage builderDefsPackage
(a : (a :

4
pkgs/applications/networking/instant-messengers/sflphone/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate { stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate
, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus , commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus
, autoconf, automake, libtool, gettext, perl , autoconf, automake, libtool, gettext, perl
, cmake, qt4 , cmake, qt4
@ -43,7 +43,7 @@ rec {
configureFlags = "--with-expat --with-expat-inc=${expat}/include " + configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
"--with-expat-lib=-lexpat --with-opus "; "--with-expat-lib=-lexpat --with-opus ";
buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate
commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
autoconf automake libtool gettext perl ]; autoconf automake libtool gettext perl ];
}; };

4
pkgs/applications/networking/instant-messengers/skype/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib { stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig , libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
, pulseaudio, lib, ... }: , libpulseaudio, lib, ... }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
libXi libXi
libXrender libXrender
libXrandr libXrandr
pulseaudio libpulseaudio
freetype freetype
fontconfig fontconfig
zlib zlib

4
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg
, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
, libredirect, quazip, less, which , libredirect, quazip, less, which
}: }:
@ -12,7 +12,7 @@ let
deps = deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base pulseaudio xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
]; ];
in in

2
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -15,7 +15,7 @@
#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt #, xmlto, docbook_xml_dtd_412, docbook_xml_xslt
, libXinerama , libXinerama
, libXv , libXv
, pulseaudioSupport ? true, pulseaudio , pulseaudioSupport ? true, libpulseaudio
}: }:
assert printerSupport -> cups != null; assert printerSupport -> cups != null;

6
pkgs/applications/networking/remote/freerdp/unstable.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor
, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv
, substituteAll , substituteAll
, pulseaudio ? null, cups ? null, pcsclite ? null , libpulseaudio ? null, cups ? null, pcsclite ? null
, buildServer ? true, optimize ? true , buildServer ? true, optimize ? true
}: }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib
alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite
]; ];
doCheck = false; doCheck = false;
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"
"-DWITH_CUNIT=OFF" "-DWITH_CUNIT=OFF"
] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON" ] ++ stdenv.lib.optional (libpulseaudio != null) "-DWITH_PULSE=ON"
++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON"
++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON" ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"
++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON"

4
pkgs/applications/office/zotero/firefox-bin/default.nix
View File

@ -31,7 +31,7 @@
, nss , nss
, pango , pango
, heimdal , heimdal
, pulseaudio , libpulseaudio
, systemd , systemd
}: }:
@ -103,7 +103,7 @@ stdenv.mkDerivation {
nss nss
pango pango
heimdal heimdal
pulseaudio libpulseaudio
systemd systemd
] + ":" + stdenv.lib.makeSearchPath "lib64" [ ] + ":" + stdenv.lib.makeSearchPath "lib64" [
stdenv.cc.cc stdenv.cc.cc

6
pkgs/applications/video/aegisub/default.nix
View File

@ -9,14 +9,14 @@
, automationSupport ? true, lua ? null , automationSupport ? true, lua ? null
, openalSupport ? false, openal ? null , openalSupport ? false, openal ? null
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, pulseaudioSupport ? true, pulseaudio ? null , pulseaudioSupport ? true, libpulseaudio ? null
, portaudioSupport ? false, portaudio ? null }: , portaudioSupport ? false, portaudio ? null }:
assert spellcheckSupport -> (hunspell != null); assert spellcheckSupport -> (hunspell != null);
assert automationSupport -> (lua != null); assert automationSupport -> (lua != null);
assert openalSupport -> (openal != null); assert openalSupport -> (openal != null);
assert alsaSupport -> (alsaLib != null); assert alsaSupport -> (alsaLib != null);
assert pulseaudioSupport -> (pulseaudio != null); assert pulseaudioSupport -> (libpulseaudio != null);
assert portaudioSupport -> (portaudio != null); assert portaudioSupport -> (portaudio != null);
with stdenv.lib; with stdenv.lib;
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
++ optional automationSupport lua ++ optional automationSupport lua
++ optional openalSupport openal ++ optional openalSupport openal
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional pulseaudioSupport pulseaudio ++ optional pulseaudioSupport libpulseaudio
++ optional portaudioSupport portaudio ++ optional portaudioSupport portaudio
; ;

6
pkgs/applications/video/bomi/default.nix
View File

@ -13,7 +13,7 @@
, libbluray , libbluray
, jackSupport ? false, jack ? null , jackSupport ? false, jack ? null
, portaudioSupport ? false, portaudio ? null , portaudioSupport ? false, portaudio ? null
, pulseSupport ? true, pulseaudio ? null , pulseSupport ? true, libpulseaudio ? null
, cddaSupport ? false, libcdda ? null , cddaSupport ? false, libcdda ? null
, youtubeSupport ? true, youtube-dl ? null , youtubeSupport ? true, youtube-dl ? null
}: }:
@ -22,7 +22,7 @@ with stdenv.lib;
assert jackSupport -> jack != null; assert jackSupport -> jack != null;
assert portaudioSupport -> portaudio != null; assert portaudioSupport -> portaudio != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert cddaSupport -> libcdda != null; assert cddaSupport -> libcdda != null;
assert youtubeSupport -> youtube-dl != null; assert youtubeSupport -> youtube-dl != null;
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
] ]
++ optional jackSupport jack ++ optional jackSupport jack
++ optional portaudioSupport portaudio ++ optional portaudioSupport portaudio
++ optional pulseSupport pulseaudio ++ optional pulseSupport libpulseaudio
++ optional cddaSupport libcdda ++ optional cddaSupport libcdda
; ;

6
pkgs/applications/video/kodi/default.nix
View File

@ -23,7 +23,7 @@
# TODO: would be nice to have nfsSupport (needs libnfs library) # TODO: would be nice to have nfsSupport (needs libnfs library)
# TODO: librtmp # TODO: librtmp
, libvdpau ? null, vdpauSupport ? true , libvdpau ? null, vdpauSupport ? true
, pulseaudio ? null, pulseSupport ? true , libpulseaudio ? null, pulseSupport ? true
, libcec ? null, cecSupport ? true , libcec ? null, cecSupport ? true
}: }:
@ -32,7 +32,7 @@ assert udevSupport -> udev != null;
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
assert sambaSupport -> samba != null; assert sambaSupport -> samba != null;
assert vdpauSupport -> libvdpau != null; assert vdpauSupport -> libvdpau != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert cecSupport -> libcec != null; assert cecSupport -> libcec != null;
let let
@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
++ lib.optional usbSupport libusb ++ lib.optional usbSupport libusb
++ lib.optional sambaSupport samba ++ lib.optional sambaSupport samba
++ lib.optional vdpauSupport libvdpau ++ lib.optional vdpauSupport libvdpau
++ lib.optional pulseSupport pulseaudio ++ lib.optional pulseSupport libpulseaudio
++ lib.optional cecSupport libcec; ++ lib.optional cecSupport libcec;
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;

6
pkgs/applications/video/mplayer/default.nix
View File

@ -18,7 +18,7 @@
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
, x264Support ? false, x264 ? null , x264Support ? false, x264 ? null
, jackaudioSupport ? false, jack2 ? null , jackaudioSupport ? false, jack2 ? null
, pulseSupport ? false, pulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
, bs2bSupport ? false, libbs2b ? null , bs2bSupport ? false, libbs2b ? null
# For screenshots # For screenshots
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
@ -45,7 +45,7 @@ assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null; assert theoraSupport -> libtheora != null;
assert x264Support -> x264 != null; assert x264Support -> x264 != null;
assert jackaudioSupport -> jack2 != null; assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert bs2bSupport -> libbs2b != null; assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null; assert libpngSupport -> libpng != null;
assert libjpegSupport -> libjpeg != null; assert libjpegSupport -> libjpeg != null;
@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
++ optional jackaudioSupport jack2 ++ optional jackaudioSupport jack2
++ optionals amrSupport [ amrnb amrwb ] ++ optionals amrSupport [ amrnb amrwb ]
++ optional x264Support x264 ++ optional x264Support x264
++ optional pulseSupport pulseaudio ++ optional pulseSupport libpulseaudio
++ optional screenSaverSupport libXScrnSaver ++ optional screenSaverSupport libXScrnSaver
++ optional lameSupport lame ++ optional lameSupport lame
++ optional vdpauSupport libvdpau ++ optional vdpauSupport libvdpau

6
pkgs/applications/video/mpv/default.nix
View File

@ -13,7 +13,7 @@
, speexSupport ? true, speex ? null , speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
, jackaudioSupport ? true, jack2 ? null , jackaudioSupport ? true, jack2 ? null
, pulseSupport ? true, pulseaudio ? null , pulseSupport ? true, libpulseaudio ? null
, bs2bSupport ? true, libbs2b ? null , bs2bSupport ? true, libbs2b ? null
# For screenshots # For screenshots
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
@ -40,7 +40,7 @@ assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null; assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null; assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jack2 != null; assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> libpulseaudio != null;
assert bs2bSupport -> libbs2b != null; assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null; assert libpngSupport -> libpng != null;
assert youtubeSupport -> youtube-dl != null; assert youtubeSupport -> youtube-dl != null;
@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray ++ optional bluraySupport libbluray
++ optional jackaudioSupport jack2 ++ optional jackaudioSupport jack2
++ optional pulseSupport pulseaudio ++ optional pulseSupport libpulseaudio
++ optional screenSaverSupport libXScrnSaver ++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau ++ optional vdpauSupport libvdpau
++ optional speexSupport speex ++ optional speexSupport speex

4
pkgs/applications/video/mythtv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec { stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec
, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
, yasm, libuuid, taglib, libtool, autoconf, automake, file , yasm, libuuid, taglib, libtool, autoconf, automake, file
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${name}/mythtv"; sourceRoot = "${name}/mythtv";
buildInputs = [ buildInputs = [
freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
libuuid taglib libuuid taglib
]; ];

4
pkgs/applications/video/simplescreenrecorder/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext { stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext
, libXfixes, mesa, pkgconfig, pulseaudio, qt4 , libXfixes, mesa, pkgconfig, libpulseaudio, qt4
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig
pulseaudio qt4 libpulseaudio qt4
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/video/vlc/default.nix
View File

@ -2,7 +2,7 @@
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image , mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt
libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms

10
pkgs/applications/virtualization/qemu/default.nix
View File

@ -13,16 +13,6 @@
# Audio libraries # Audio libraries
, libpulseaudio ? null, alsaLib ? null , libpulseaudio ? null, alsaLib ? null
#, pixman ? null
#, python, zlib, glib, ncurses, perl
#, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
#, libseccomp, libaio, libcap_ng, gnutls
#, makeWrapper
#, pulseSupport ? true, pulseaudio
#, sdlSupport ? true, SDL
#, vncSupport ? true, libjpeg, libpng
#, spiceSupport ? true, spice, spice_protocol, usbredir
# Extra options # Extra options
, type ? "" , type ? ""
}: }:

4
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -5,7 +5,7 @@
, javaBindings ? false, jdk ? null , javaBindings ? false, jdk ? null
, pythonBindings ? false, python ? null , pythonBindings ? false, python ? null
, enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null
, pulseSupport ? false, pulseaudio ? null , pulseSupport ? false, libpulseaudio ? null
, enableHardening ? false , enableHardening ? false
}: }:
@ -69,7 +69,7 @@ in stdenv.mkDerivation {
pkgconfig which libXmu nukeReferences ] pkgconfig which libXmu nukeReferences ]
++ optional javaBindings jdk ++ optional javaBindings jdk
++ optional pythonBindings python ++ optional pythonBindings python
++ optional pulseSupport pulseaudio; ++ optional pulseSupport libpulseaudio;
prePatch = '' prePatch = ''
set -x set -x

4
pkgs/desktops/cinnamon/cinnamon-control-center.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify, { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify,
gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, kerberos, gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, libpulseaudio, isocodes, kerberos,
libxkbfile}: libxkbfile}:
let let
@ -24,7 +24,7 @@ stdenv.mkDerivation {
intltool libxslt gtk3 cinnamon-desktop intltool libxslt gtk3 cinnamon-desktop
libnotify gnome-menus libxml2 systemd libnotify gnome-menus libxml2 systemd
upower cinnamon-settings-daemon colord upower cinnamon-settings-daemon colord
polkit ibus libcanberra_gtk3 pulseaudio polkit ibus libcanberra_gtk3 libpulseaudio
isocodes kerberos libxkbfile ]; isocodes kerberos libxkbfile ];
preBuild = "patchShebangs ./scripts"; preBuild = "patchShebangs ./scripts";

4
pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3, { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3,
libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, pulseaudio, upower, libcanberra_gtk3, colord, libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, libpulseaudio, upower, libcanberra_gtk3, colord,
systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}: systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}:
let let
@ -25,7 +25,7 @@ stdenv.mkDerivation {
glib gettext gnome_common glib gettext gnome_common
intltool gtk3 libnotify lcms2 intltool gtk3 libnotify lcms2
libgnomekbd libxklavier colord libgnomekbd libxklavier colord
libcanberra pulseaudio upower libcanberra libpulseaudio upower
libcanberra_gtk3 cinnamon-desktop libcanberra_gtk3 cinnamon-desktop
systemd libxslt docbook_xsl makeWrapper systemd libxslt docbook_xsl makeWrapper
gsettings_desktop_schemas gsettings_desktop_schemas

4
pkgs/desktops/e19/efl.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto
xlibs.libX11 udev utillinuxCurses ]; xlibs.libX11 udev utillinuxCurses ];
propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite

4
pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk
, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, pulseaudio }: , intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnome-settings-daemon-2.32.1"; name = "gnome-settings-daemon-2.32.1";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit
pulseaudio libpulseaudio
]; ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
View File

@ -2,7 +2,7 @@
, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf , file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream , dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts , clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
, gcr, libsecret, folks, pulseaudio, telepathy_mission_control , gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
, telepathy_logger, libnotify, clutter, libsoup, gnutls , telepathy_logger, libnotify, clutter, libsoup, gnutls
, evolution_data_server , evolution_data_server
, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info , libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libxml2 libxslt icu file makeWrapper libxml2 libxslt icu file makeWrapper
telepathy_glib clutter_gtk clutter-gst cogl telepathy_glib clutter_gtk clutter-gst cogl
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gstreamer gst_all_1.gst-plugins-base
gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11_kit libnotify clutter libsoup gnutls libgee p11_kit
libcanberra_gtk3 telepathy_farstream farstream libcanberra_gtk3 telepathy_farstream farstream
gnome3.adwaita-icon-theme hicolor_icon_theme gnome3.adwaita-icon-theme hicolor_icon_theme

4
pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio, fontconfig
, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, python, libkrb5, networkmanagerapplet, networkmanager , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3; buildInputs = with gnome3;
[ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk

4
pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit , libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager
, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: , docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3; buildInputs = with gnome3;
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
libcanberra_gtk3 upower colord libgweather xkeyboard_config libcanberra_gtk3 upower colord libgweather xkeyboard_config
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];

4
pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
View File

@ -2,7 +2,7 @@
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
, sqlite, libgweather, libcanberra_gtk3 , sqlite, libgweather, libcanberra_gtk3
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper , libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
[ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
libcanberra_gtk3 gnome_control_center libcanberra_gtk3 gnome_control_center
defaultIconTheme sqlite gnome3.gnome-bluetooth defaultIconTheme sqlite gnome3.gnome-bluetooth

4
pkgs/desktops/kde-4.14/kde-runtime.nix
View File

@ -1,5 +1,5 @@
{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2 { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
}: }:
@ -8,7 +8,7 @@ kde {
buildInputs = [ buildInputs = [
kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
qca2 samba libcanberra pulseaudio gpgme qca2 samba libcanberra libpulseaudio gpgme
networkmanager kactivities kdepimlibs openexr networkmanager kactivities kdepimlibs openexr
#todo: add openslp #todo: add openslp
#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late

4
pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
View File

@ -1,6 +1,6 @@
{ kde, kdelibs, libcanberra, pulseaudio }: { kde, kdelibs, libcanberra, libpulseaudio }:
kde { kde {
buildInputs = [ kdelibs libcanberra pulseaudio ]; buildInputs = [ kdelibs libcanberra libpulseaudio ];
meta = { meta = {
description = "sound mixer, an application to allow you to change the volume of your sound card"; description = "sound mixer, an application to allow you to change the volume of your sound card";
}; };

4
pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pulseaudio { stdenv, fetchurl, pkgconfig, libpulseaudio
, gtk2, libnotify , gtk2, libnotify
, keybinder, xfconf , keybinder, xfconf
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pulseaudio gtk2 [ libpulseaudio gtk2
keybinder xfconf libnotify keybinder xfconf libnotify
]; ];

4
pkgs/development/compilers/squeak/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
, libpthreadstubs, pango, pkgconfig, pulseaudio, which }: , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
let version = "4.10.2.2614"; in let version = "4.10.2.2614"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs
pango pkgconfig pulseaudio which ]; pango pkgconfig libpulseaudio which ];
postPatch = '' postPatch = ''
for i in squeak.in squeak.sh.in; do for i in squeak.in squeak.sh.in; do

6
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -101495,16 +101495,16 @@ self: {
}) {}; }) {};
"pulse-simple" = callPackage "pulse-simple" = callPackage
({ mkDerivation, base, bytestring, pulseaudio }: ({ mkDerivation, base, bytestring, libpulseaudio }:
mkDerivation { mkDerivation {
pname = "pulse-simple"; pname = "pulse-simple";
version = "0.1.14"; version = "0.1.14";
sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4"; sha256 = "1as1cnx50mqmib5llzy2w218rg7dxmhz6nfa9kryfjzk0n5rshl4";
buildDepends = [ base bytestring ]; buildDepends = [ base bytestring ];
extraLibraries = [ pulseaudio ]; extraLibraries = [ libpulseaudio ];
description = "binding to Simple API of pulseaudio"; description = "binding to Simple API of pulseaudio";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) { inherit (pkgs) pulseaudio;}; }) { inherit (pkgs) libpulseaudio;};
"punkt" = callPackage "punkt" = callPackage
({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text

6
pkgs/development/libraries/SDL/default.nix
View File

@ -2,7 +2,7 @@
, openglSupport ? false, mesa ? null , openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, x11Support ? true, x11 ? null, libXrandr ? null , x11Support ? true, x11 ? null, libXrandr ? null
, pulseaudioSupport ? true, pulseaudio ? null , pulseaudioSupport ? true, libpulseaudio ? null
}: }:
# OSS is no longer supported, for it's much crappier than ALSA and # OSS is no longer supported, for it's much crappier than ALSA and
@ -12,7 +12,7 @@ assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport
assert openglSupport -> (mesa != null && x11Support); assert openglSupport -> (mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null); assert x11Support -> (x11 != null && libXrandr != null);
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null; assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.15"; version = "1.2.15";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
propagatedNativeBuildInputs = propagatedNativeBuildInputs =
stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional alsaSupport alsaLib ++
stdenv.lib.optional pulseaudioSupport pulseaudio; stdenv.lib.optional pulseaudioSupport libpulseaudio;
buildInputs = let buildInputs = let
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";

6
pkgs/development/libraries/SDL2/default.nix
View File

@ -2,7 +2,7 @@
, openglSupport ? false, mesa ? null , openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, x11Support ? true, x11 ? null, libXrandr ? null , x11Support ? true, x11 ? null, libXrandr ? null
, pulseaudioSupport ? true, pulseaudio ? null , pulseaudioSupport ? true, libpulseaudio ? null
}: }:
# OSS is no longer supported, for it's much crappier than ALSA and # OSS is no longer supported, for it's much crappier than ALSA and
@ -12,7 +12,7 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null); assert x11Support -> (x11 != null && libXrandr != null);
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null; assert pulseaudioSupport -> libpulseaudio != null;
let let
configureFlagsFun = attrs: '' configureFlagsFun = attrs: ''
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
stdenv.lib.optional pulseaudioSupport pulseaudio; stdenv.lib.optional pulseaudioSupport libpulseaudio;
buildInputs = [ pkgconfig audiofile ] ++ buildInputs = [ pkgconfig audiofile ] ++
stdenv.lib.optional openglSupport [ mesa ] ++ stdenv.lib.optional openglSupport [ mesa ] ++

4
pkgs/development/libraries/despotify/default.nix
View File

@ -1,5 +1,5 @@
{ {
stdenv, fetchsvn, openssl, zlib, libvorbis, pulseaudio, gstreamer, libao, stdenv, fetchsvn, openssl, zlib, libvorbis, libpulseaudio, gstreamer, libao,
libtool, ncurses, glibc libtool, ncurses, glibc
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
openssl zlib libvorbis pulseaudio gstreamer libao libtool ncurses glibc openssl zlib libvorbis libpulseaudio gstreamer libao libtool ncurses glibc
]; ];
configurePhase = "cd src"; configurePhase = "cd src";

6
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -108,7 +108,7 @@
#, openh264 ? null # H.264/AVC encoder #, openh264 ? null # H.264/AVC encoder
, openjpeg_1 ? null # JPEG 2000 de/encoder , openjpeg_1 ? null # JPEG 2000 de/encoder
, opensslExtlib ? false, openssl ? null , opensslExtlib ? false, openssl ? null
, pulseaudio ? null # Pulseaudio input support , libpulseaudio ? null # Pulseaudio input support
, rtmpdump ? null # RTMP[E] support , rtmpdump ? null # RTMP[E] support
#, libquvi ? null # Quvi input support #, libquvi ? null # Quvi input support
, samba ? null # Samba protocol , samba ? null # Samba protocol
@ -361,7 +361,7 @@ stdenv.mkDerivation rec {
#(enableFeature (openh264 != null) "openh264") #(enableFeature (openh264 != null) "openh264")
(enableFeature (openjpeg_1 != null) "libopenjpeg") (enableFeature (openjpeg_1 != null) "libopenjpeg")
(enableFeature (opensslExtlib && gplLicensing) "openssl") (enableFeature (opensslExtlib && gplLicensing) "openssl")
(enableFeature (pulseaudio != null) "libpulse") (enableFeature (libpulseaudio != null) "libpulse")
#(enableFeature quvi "libquvi") #(enableFeature quvi "libquvi")
(enableFeature (rtmpdump != null) "librtmp") (enableFeature (rtmpdump != null) "librtmp")
#(enableFeature (schroedinger != null) "libschroedinger") #(enableFeature (schroedinger != null) "libschroedinger")
@ -399,7 +399,7 @@ stdenv.mkDerivation rec {
bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug jack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 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 samba SDL soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
] ++ optional openglExtlib mesa ] ++ optional openglExtlib mesa
++ optionals x11grabExtlib [ libXext libXfixes ] ++ optionals x11grabExtlib [ libXext libXfixes ]

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , 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 , x264, xvidcore, zlib
, openglSupport ? false, mesa ? null , openglSupport ? false, mesa ? null
# Build options # Build options
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib
] ++ optional openglSupport mesa ] ++ 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 || isFreeBSD) libva
++ optional isLinux alsaLib; ++ optional isLinux alsaLib;

4
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -3,7 +3,7 @@
, libv4l, libdv, libavc1394, libiec61883 , libv4l, libdv, libavc1394, libiec61883
, libvpx, speex, flac, taglib , libvpx, speex, flac, taglib
, cairo, gdk_pixbuf, aalib, libcaca , cairo, gdk_pixbuf, aalib, libcaca
, libsoup, pulseaudio, libintlOrEmpty , libsoup, libpulseaudio, libintlOrEmpty
}: }:
let let
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
libsoup libsoup
] ]
++ libintlOrEmpty ++ libintlOrEmpty
++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ]; ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
LDFLAGS = optionalString stdenv.isDarwin "-lintl"; LDFLAGS = optionalString stdenv.isDarwin "-lintl";
} }

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2, libsoup, libintlOrEmpty , glib, gstreamer, bzip2, libsoup, libintlOrEmpty
, # Whether to build no plugins that have external dependencies , # Whether to build no plugins that have external dependencies
# (except the PulseAudio plugin). # (except the PulseAudio plugin).
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base ] [ pkgconfig glib gstreamer gst_plugins_base ]
++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ] ++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ]
++ libintlOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optionals (!minimalDeps) ++ stdenv.lib.optionals (!minimalDeps)
[ aalib libcaca cairo libdv flac libjpeg libpng speex [ aalib libcaca cairo libdv flac libjpeg libpng speex

4
pkgs/development/libraries/libao/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib, libcap { lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap
, usePulseAudio }: , usePulseAudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig libcap ] ++ [ pkgconfig libcap ] ++
lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]); lib.optional stdenv.isLinux (if usePulseAudio then [ libpulseaudio ] else [ alsaLib ]);
meta = { meta = {
longDescription = '' longDescription = ''

4
pkgs/development/libraries/libcanberra/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
, alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }: , alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcanberra-0.30"; name = "libcanberra-0.30";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
pkgconfig libtool alsaLib pulseaudio libvorbis gtk libcap pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap
/*gstreamer gst_plugins_base*/ # ToDo: gstreamer not found (why?), add (g)udev? /*gstreamer gst_plugins_base*/ # ToDo: gstreamer not found (why?), add (g)udev?
]; ];

6
pkgs/development/libraries/libmikmod/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }: { stdenv, fetchurl, texinfo, alsaLib, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmikmod-3.3.7"; name = "libmikmod-3.3.7";
@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ texinfo ] buildInputs = [ texinfo ]
++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ]; ++ stdenv.lib.optional stdenv.isLinux [ alsaLib libpulseaudio ];
propagatedBuildInputs = propagatedBuildInputs =
stdenv.lib.optional stdenv.isLinux pulseaudio; stdenv.lib.optional stdenv.isLinux libpulseaudio;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound";

4
pkgs/development/libraries/mediastreamer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
, libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp
, ortp, libv4l, libpcap, srtp, vim , ortp, libv4l, libpcap, srtp, vim
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ propagatedBuildInputs = [
alsaLib pulseaudio speex gsm libopus alsaLib libpulseaudio speex gsm libopus
ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp
ortp libv4l libpcap srtp ortp libv4l libpcap srtp
vim vim

6
pkgs/development/libraries/openal-soft/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake { stdenv, fetchurl, cmake
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, pulseSupport ? true, pulseaudio ? null , pulseSupport ? true, libpulseaudio ? null
}: }:
with stdenv.lib; with stdenv.lib;
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert pulseSupport -> pulseaudio != null; assert pulseSupport -> libpulseaudio != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.16.0"; version = "1.16.0";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake ] buildInputs = [ cmake ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional pulseSupport pulseaudio; ++ optional pulseSupport libpulseaudio;
NIX_LDFLAGS = [] NIX_LDFLAGS = []
++ optional alsaSupport "-lasound" ++ optional alsaSupport "-lasound"

4
pkgs/development/libraries/phonon/qt4/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }: { stdenv, fetchurl, cmake, automoc4, libpulseaudio, qt4 }:
with stdenv.lib; with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn"; sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
}; };
buildInputs = [ qt4 pulseaudio ]; buildInputs = [ qt4 libpulseaudio ];
nativeBuildInputs = [ cmake automoc4 ]; nativeBuildInputs = [ cmake automoc4 ];

4
pkgs/development/libraries/phonon/qt5/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }: { stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }:
with stdenv.lib; with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
}; };
buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ]; buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];

4
pkgs/development/libraries/qt-5/5.3/default.nix
View File

@ -5,7 +5,7 @@
, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage , gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage
, xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon
, alsaLib, gstreamer, gst_plugins_base , alsaLib, gstreamer, gst_plugins_base
, pulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor , libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor
, flashplayerFix ? false , flashplayerFix ? false
, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
, buildDocs ? false , buildDocs ? false
@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
zlib libjpeg libpng libtiff sqlite icu zlib libjpeg libpng libtiff sqlite icu
libwebp alsaLib gstreamer gst_plugins_base pulseaudio libwebp alsaLib gstreamer gst_plugins_base libpulseaudio
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
] ]
# Qt doesn't directly need GLU (just GL), but many apps use, it's small and # Qt doesn't directly need GLU (just GL), but many apps use, it's small and

4
pkgs/development/libraries/qt-5/5.4/default.nix
View File

@ -147,14 +147,14 @@ let
multimedia = callPackage multimedia = callPackage
( (
{ qtSubmodule, base, declarative { qtSubmodule, base, declarative
, alsaLib, gstreamer, gst_plugins_base, pulseaudio , alsaLib, gstreamer, gst_plugins_base, libpulseaudio
}: }:
qtSubmodule { qtSubmodule {
name = "qtmultimedia"; name = "qtmultimedia";
qtInputs = [ base declarative ]; qtInputs = [ base declarative ];
buildInputs = [ buildInputs = [
alsaLib gstreamer gst_plugins_base pulseaudio alsaLib gstreamer gst_plugins_base libpulseaudio
]; ];
} }
) )

4
pkgs/development/libraries/spice-gtk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1
, openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup , cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup
, gtk3, enableGTK3 ? false }: , gtk3, enableGTK3 ? false }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection
libjpeg_turbo zlib cyrus_sasl python pygtk usbredir libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]);

4
pkgs/development/libraries/xine-lib/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib { stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib
, libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg
, flac, libcaca, pulseaudio, libmng, libcdio, libv4l, vcdimager , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager
, libmpcdec , libmpcdec
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext
alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac
libcaca pulseaudio libmng libcdio libv4l vcdimager libmpcdec libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec
]; ];
NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss"; NIX_LDFLAGS = "-rpath ${libdvdcss}/lib -L${libdvdcss}/lib -ldvdcss";

4
pkgs/games/adom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio { stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio
, xlibs, plowshare }: , xlibs, plowshare }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -8,7 +8,7 @@ let
inherit (xlibs) libXext libX11; inherit (xlibs) libXext libX11;
lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [
zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio]; zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];
in in
assert stdenv.is64bit; assert stdenv.is64bit;

4
pkgs/games/anki/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, lame, mplayer, pulseaudio, portaudio { stdenv, lib, fetchurl, lame, mplayer, libpulseaudio, portaudio
, python, pyqt4, pythonPackages , python, pyqt4, pythonPackages
# This little flag adds a huge number of dependencies, but we assume that # This little flag adds a huge number of dependencies, but we assume that
# everyone wants Anki to draw plots with statistics by default. # everyone wants Anki to draw plots with statistics by default.
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ] pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio ]
++ lib.optional plotsSupport py.matplotlib; ++ lib.optional plotsSupport py.matplotlib;
buildInputs = [ python py.wrapPython lame mplayer pulseaudio ]; buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ];
preConfigure = '' preConfigure = ''
substituteInPlace anki \ substituteInPlace anki \

4
pkgs/games/minecraft/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
, mesa, openal, alsaOss, pulseaudioSupport ? false, pulseaudio }: , mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }:
assert jre ? architecture; assert jre ? architecture;
@ -23,7 +23,7 @@ stdenv.mkDerivation {
# wrapper for minecraft # wrapper for minecraft
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
${if pulseaudioSupport then "${pulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \
${jre}/bin/java -jar $out/minecraft.jar ${jre}/bin/java -jar $out/minecraft.jar
EOF EOF

4
pkgs/games/scrolls/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gcc { stdenv, fetchurl, gcc
, mesa_glu, libX11, libXext, libXcursor, pulseaudio , mesa_glu, libX11, libXext, libXcursor, libpulseaudio
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "scrolls-2014-03-08"; name = "scrolls-2014-03-08";
@ -25,7 +25,7 @@ stdenv.mkDerivation {
libX11 libX11
libXext libXext
libXcursor libXcursor
pulseaudio libpulseaudio
]; ];
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];

4
pkgs/games/stepmania/default.nix
View File

@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib { fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib
, pulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk , libpulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk
, mesa, glew }: , mesa, glew }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
pkgconfig autoconf automake yasm zlib bzip2 alsaLib pulseaudio libmad libtheora pkgconfig autoconf automake yasm zlib bzip2 alsaLib libpulseaudio libmad libtheora
libvorbis libpng libjpeg gtk mesa glew libvorbis libpng libjpeg gtk mesa glew
]; ];

4
pkgs/games/vessel/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, requireFile, SDL, pulseaudio, alsaLib }: { stdenv, requireFile, SDL, libpulseaudio, alsaLib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vessel-12082012"; name = "vessel-12082012";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
ld_preload = ./isatty.c; ld_preload = ./isatty.c;
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ]
+ ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; + ":" + stdenv.lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ;
installPhase = '' installPhase = ''
mkdir -p $out/libexec/strangeloop/vessel/ mkdir -p $out/libexec/strangeloop/vessel/

4
pkgs/misc/emulators/dolphin-emu/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
, gettext, libpthreadstubs, libXrandr, libXext, readline , gettext, libpthreadstubs, libXrandr, libXext, readline
, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl
, pulseaudio ? null }: , libpulseaudio ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dolphin-emu-4.0.2"; name = "dolphin-emu-4.0.2";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
gettext libpthreadstubs libXrandr libXext readline openal gettext libpthreadstubs libXrandr libXext readline openal
libXdmcp portaudio SDL wxGTK30 pulseaudio ]; libXdmcp portaudio SDL wxGTK30 libpulseaudio ];
meta = { meta = {
homepage = http://dolphin-emu.org/; homepage = http://dolphin-emu.org/;

4
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -1,7 +1,7 @@
{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
, gettext, git, libpthreadstubs, libXrandr, libXext, readline , gettext, git, libpthreadstubs, libXrandr, libXext, readline
, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb
, pulseaudio ? null }: , libpulseaudio ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dolphin-emu-20150421"; name = "dolphin-emu-20150421";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
gettext libpthreadstubs libXrandr libXext readline openal gettext libpthreadstubs libXrandr libXext readline openal
git libXdmcp portaudio SDL wxGTK30 libusb pulseaudio ]; git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ];
meta = { meta = {
homepage = http://dolphin-emu.org/; homepage = http://dolphin-emu.org/;

4
pkgs/misc/emulators/higan/default.nix
View File

@ -3,7 +3,7 @@
, libX11, libXv , libX11, libXv
, udev , udev
, mesa, SDL , mesa, SDL
, libao, openal, pulseaudio , libao, openal, libpulseaudio
, profile ? "performance" # Options: accuracy, balanced, performance , profile ? "performance" # Options: accuracy, balanced, performance
, guiToolkit ? "gtk" # can be gtk or qt4 , guiToolkit ? "gtk" # can be gtk or qt4
, gtk ? null, qt4 ? null }: , gtk ? null, qt4 ? null }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ pkgconfig libX11 libXv udev mesa SDL libao openal pulseaudio ] [ pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio ]
++ optionals (guiToolkit == "gtk") [ gtk ] ++ optionals (guiToolkit == "gtk") [ gtk ]
++ optionals (guiToolkit == "qt4") [ qt4 ]; ++ optionals (guiToolkit == "qt4") [ qt4 ];

4
pkgs/misc/emulators/retroarch/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit { stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit
, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib , freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib
, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }: , libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "retroarch-bare-${version}"; name = "retroarch-bare-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ]; python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL libpulseaudio ];
patchPhase = '' patchPhase = ''
export GLOBAL_CONFIG_DIR=$out/etc export GLOBAL_CONFIG_DIR=$out/etc

4
pkgs/misc/emulators/snes9x-gtk/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, pulseaudio}: {stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "snes9x-gtk-${version}"; name = "snes9x-gtk-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3";
}; };
buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 pulseaudio]; buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio];
sourceRoot = "snes9x-${version}-src/gtk"; sourceRoot = "snes9x-${version}-src/gtk";

4
pkgs/servers/mpd/default.nix
View File

@ -17,7 +17,7 @@
, mmsSupport ? true, libmms , mmsSupport ? true, libmms
, mpg123Support ? true, mpg123 , mpg123Support ? true, mpg123
, aacSupport ? true, faad2 , aacSupport ? true, faad2
, pulseaudioSupport ? true, pulseaudio , pulseaudioSupport ? true, libpulseaudio
, jackSupport ? true, jack2 , jackSupport ? true, jack2
, gmeSupport ? true, game-music-emu , gmeSupport ? true, game-music-emu
, icuSupport ? true, icu , icuSupport ? true, icu
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
++ opt mpg123Support mpg123 ++ opt mpg123Support mpg123
++ opt aacSupport faad2 ++ opt aacSupport faad2
++ opt zipSupport zziplib ++ opt zipSupport zziplib
++ opt pulseaudioSupport pulseaudio ++ opt pulseaudioSupport libpulseaudio
++ opt jackSupport jack2 ++ opt jackSupport jack2
++ opt gmeSupport game-music-emu ++ opt gmeSupport game-music-emu
++ opt icuSupport icu ++ opt icuSupport icu

4
pkgs/servers/shairport-sync/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, pulseaudio }: { stdenv, fetchurl, openssl, avahi, alsaLib, libdaemon, autoconf, automake, libtool, popt, unzip, pkgconfig, libconfig, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.3.0"; version = "2.3.0";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
popt popt
unzip unzip
libconfig libconfig
pulseaudio libpulseaudio
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/tools/admin/gtk-vnc/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gobjectIntrospection { stdenv, fetchurl, gobjectIntrospection
, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
, libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
, pygobject3, libogg, enableGTK3 ? false, libgpgerror }: , pygobject3, libogg, enableGTK3 ? false, libgpgerror }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
python gnutls cairo libtool pkgconfig glib libffi libgcrypt python gnutls cairo libtool pkgconfig glib libffi libgcrypt
intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
gobjectIntrospection libogg libgpgerror gobjectIntrospection libogg libgpgerror
] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]); ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);

4
pkgs/tools/audio/liquidsoap/full.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, pkgconfig { stdenv, fetchurl, which, pkgconfig
, ocaml, ocamlPackages , ocaml, ocamlPackages
, libao, portaudio, alsaLib, pulseaudio, jack2 , libao, portaudio, alsaLib, libpulseaudio, jack2
, libsamplerate, libmad, taglib, lame, libogg , libsamplerate, libmad, taglib, lame, libogg
, libvorbis, speex, libtheora, libopus, fdk_aac , libvorbis, speex, libtheora, libopus, fdk_aac
, faad2, flac, ladspaH, ffmpeg, frei0r, dssi , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
@ -27,7 +27,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ which ocaml ocamlPackages.findlib pkgconfig [ which ocaml ocamlPackages.findlib pkgconfig
libao portaudio alsaLib pulseaudio jack2 libao portaudio alsaLib libpulseaudio jack2
libsamplerate libmad taglib lame libogg libsamplerate libmad taglib lame libogg
libvorbis speex libtheora libopus fdk_aac libvorbis speex libtheora libopus fdk_aac
faad2 flac ladspaH ffmpeg frei0r dssi faad2 flac ladspaH ffmpeg frei0r dssi

4
pkgs/tools/audio/pa-applet/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }: { stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pa-applet"; name = "pa-applet";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
gtk3 pulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev gtk3 libpulseaudio glibc pkgconfig automake autoconf libnotify libX11 xf86inputevdev
]; ];
preConfigure = '' preConfigure = ''

4
pkgs/tools/audio/pasystray/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig {stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
, gnome3, avahi, gtk3, libnotify, pulseaudio, x11}: , gnome3, avahi, gtk3, libnotify, libpulseaudio, x11}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pasystray-0.5.2"; name = "pasystray-0.5.2";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake makeWrapper pkgconfig buildInputs = [ autoconf automake makeWrapper pkgconfig
gnome3.defaultIconTheme gnome3.defaultIconTheme
avahi gtk3 libnotify pulseaudio x11 ]; avahi gtk3 libnotify libpulseaudio x11 ];
preConfigure = '' preConfigure = ''
aclocal aclocal

4
pkgs/tools/bluetooth/blueman/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk { stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk
, notify, pythonDBus, bluez, glib, gtk, libstartup_notification , notify, pythonDBus, bluez, glib, gtk, libstartup_notification
, makeWrapper, xdg_utils, obex_data_server , makeWrapper, xdg_utils, obex_data_server
, pulseaudio , libpulseaudio
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
for i in $out/bin/* $out/libexec/*; do for i in $out/bin/* $out/libexec/*; do
wrapProgram $i \ wrapProgram $i \
--set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \ --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \
--set LD_LIBRARY_PATH "${pulseaudio}/lib:" \ --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg_utils}/bin
done done

2
pkgs/top-level/all-packages.nix
View File

@ -5959,7 +5959,7 @@ let
libvpx = if stdenv.isDarwin then null else libvpx; libvpx = if stdenv.isDarwin then null else libvpx;
openal = if stdenv.isDarwin then null else openal; openal = if stdenv.isDarwin then null else openal;
openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1; openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1;
pulseaudio = if stdenv.isDarwin then null else pulseaudio; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
samba = if stdenv.isDarwin then null else samba; samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab; vid-stab = if stdenv.isDarwin then null else vid-stab;
x265 = if stdenv.isDarwin then null else x265; x265 = if stdenv.isDarwin then null else x265;