PulseAudio: Use new ALSA, disable ConsoleKit.

svn path=/nixpkgs/trunk/; revision=13809
This commit is contained in:
Ludovic Courtès 2009-01-19 20:22:54 +00:00
parent d17d9dfb39
commit 5bc0b549f0
2 changed files with 10 additions and 2 deletions

View File

@ -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
'';

View File

@ -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 {