summary refs log tree commit diff
path: root/pkgs/servers/pulseaudio/default.nix
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-07-08 13:25:52 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-07-08 13:25:52 +0000
commitccc497f80d4bc74f392beca717ea4781a3a60ddd (patch)
treeee308e93a0932a4cf46d29ac8d9bbcb68beedb9a /pkgs/servers/pulseaudio/default.nix
parent3c824666fd86301494f2a6db3ebf1b2e1277541a (diff)
downloadnixlib-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar
nixlib-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.gz
nixlib-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.bz2
nixlib-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.lz
nixlib-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.xz
nixlib-ccc497f80d4bc74f392beca717ea4781a3a60ddd.tar.zst
nixlib-ccc497f80d4bc74f392beca717ea4781a3a60ddd.zip
Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
Diffstat (limited to 'pkgs/servers/pulseaudio/default.nix')
-rw-r--r--pkgs/servers/pulseaudio/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 5e0440d9c9ff..e2e948754517 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
 , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
-, libcap, alsaLib, libsamplerate, libsndfile, speex }:
+, libcap, alsaLib, libsamplerate, libsndfile, speex
+, ...}:
 
 stdenv.mkDerivation rec {
   name = "pulseaudio-0.9.21";