Author: urkud
Date: Sat Jul 31 13:05:58 2010
New Revision: 22834
URL: https://svn.nixos.org/websvn/nix/?rev=22834&sc=1
Log:
pulseaudio: udev and bluez support
Modified:
nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix Sat Jul 31 13:05:46
2010 (r22833)
+++ nixpkgs/trunk/pkgs/servers/pulseaudio/default.nix Sat Jul 31 13:05:58
2010 (r22834)
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
+{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
, gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
-, libcap, alsaLib, libsamplerate, libsndfile, speex
+, libcap, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
, ...}:
stdenv.mkDerivation rec {
@@ -15,10 +15,10 @@
propagatedBuildInputs = [ gdbm ];
buildInputs = [
- pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
+ pkgconfig gnum4 libtool glib dbus avahi gconf liboil
libsamplerate libsndfile speex alsaLib libcap
gtk libX11 libICE libSM libXtst libXi
- intltool gettext
+ intltool gettext bluez udev
];
preConfigure = ''
@@ -33,7 +33,8 @@
'';
configureFlags = ''
- --disable-solaris --disable-udev --disable-jack --disable-bluez
--localstatedir=/var
+ --disable-solaris --disable-hal --disable-jack --localstatedir=/var
+ --disable-oss-output --disable-oss-wrapper
'';
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jul 31 13:05:46
2010 (r22833)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jul 31 13:05:58
2010 (r22834)
@@ -6004,8 +6004,8 @@
pulseaudio = makeOverridable (import ../servers/pulseaudio) {
inherit fetchurl stdenv pkgconfig gnum4 gdbm
- dbus hal avahi liboil libsamplerate libsndfile speex
- intltool gettext libtool libcap;
+ dbus avahi liboil libsamplerate libsndfile speex
+ intltool gettext libtool libcap bluez udev;
inherit (xlibs) libX11 libICE libSM libXtst libXi;
inherit (gtkLibs) gtk glib;
inherit alsaLib; # Needs ALSA >= 1.0.17.
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
