summary refs log tree commit diff
path: root/pkgs/servers/pulseaudio/default.nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-01-19 20:22:54 +0000
committerLudovic Courtès <ludo@gnu.org>2009-01-19 20:22:54 +0000
commit5bc0b549f0b1b25b187734dac959d07c770b267e (patch)
treebbccfdcb50445637f52a28b92c9dd2193de9dacf /pkgs/servers/pulseaudio/default.nix
parentd17d9dfb39197b9ca02d65a6bb55e6046799c632 (diff)
downloadnixpkgs-5bc0b549f0b1b25b187734dac959d07c770b267e.tar
nixpkgs-5bc0b549f0b1b25b187734dac959d07c770b267e.tar.gz
nixpkgs-5bc0b549f0b1b25b187734dac959d07c770b267e.tar.bz2
nixpkgs-5bc0b549f0b1b25b187734dac959d07c770b267e.tar.lz
nixpkgs-5bc0b549f0b1b25b187734dac959d07c770b267e.tar.xz
nixpkgs-5bc0b549f0b1b25b187734dac959d07c770b267e.tar.zst
nixpkgs-5bc0b549f0b1b25b187734dac959d07c770b267e.zip
PulseAudio: Use new ALSA, disable ConsoleKit.
svn path=/nixpkgs/trunk/; revision=13809
Diffstat (limited to 'pkgs/servers/pulseaudio/default.nix')
-rw-r--r--pkgs/servers/pulseaudio/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index c23df0c0ab0..1e2ffd31d94 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
   '';