diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index c23df0c0ab04..1e2ffd31d944 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi -, gconf, liboil, libX11, libICE, libSM, intltool, gettext +, gconf, liboil, libX11, libICE, libSM, intltool, gettext, alsaLib , libsamplerate, libsndfile, speex }: stdenv.mkDerivation rec { @@ -12,11 +12,18 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 gdbm libtool glib dbus hal avahi gconf liboil - libsamplerate libsndfile speex + libsamplerate libsndfile speex alsaLib libX11 libICE libSM intltool gettext ]; + preConfigure = '' + # Disable the ConsoleKit module since we don't currently have that + # on NixOS. + sed -i "src/daemon/default.pa.in" \ + -e 's/^\( *load-module \+module-console-kit\)/# \1/g' + ''; + configureFlags = '' --disable-solaris --disable-jack --disable-bluez --disable-polkit --with-x --enable-asyncdns --localstatedir=/var ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 343656730fc9..edb9c2ba8e03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5787,6 +5787,7 @@ let inherit (gtkLibs) glib; inherit (xlibs) libX11 libICE libSM; gconf = gnome.GConf; + alsaLib = alsa_1_0_19.alsaLib; # Needs ALSA >= 1.0.17. }; tomcat_connectors = import ../servers/http/apache-modules/tomcat-connectors {