alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pulseaudio: udev and bluez support

Browse source 
svn path=/nixpkgs/trunk/; revision=22834
This commit is contained in:
Yury G. Kudryashov 2010-07-31 13:05:58 +00:00
parent 59a8bc0744
commit 288c414bb4
2 changed files with 8 additions and 7 deletions
pkgs
servers/pulseaudio
default.nix
top-level
all-packages.nix

11
pkgs/servers/pulseaudio/default.nix
View file

@ -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 , 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 { stdenv.mkDerivation rec {
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gdbm ]; propagatedBuildInputs = [ gdbm ];
buildInputs = [ buildInputs = [
pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil pkgconfig gnum4 libtool glib dbus avahi gconf liboil
libsamplerate libsndfile speex alsaLib libcap libsamplerate libsndfile speex alsaLib libcap
gtk libX11 libICE libSM libXtst libXi gtk libX11 libICE libSM libXtst libXi
intltool gettext intltool gettext bluez udev
]; ];
preConfigure = '' preConfigure = ''
@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = '' 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 = { meta = {

4
pkgs/top-level/all-packages.nix
View file

@ -6004,8 +6004,8 @@ let
pulseaudio = makeOverridable (import ../servers/pulseaudio) { pulseaudio = makeOverridable (import ../servers/pulseaudio) {
inherit fetchurl stdenv pkgconfig gnum4 gdbm inherit fetchurl stdenv pkgconfig gnum4 gdbm
dbus hal avahi liboil libsamplerate libsndfile speex dbus avahi liboil libsamplerate libsndfile speex
intltool gettext libtool libcap; intltool gettext libtool libcap bluez udev;
inherit (xlibs) libX11 libICE libSM libXtst libXi; inherit (xlibs) libX11 libICE libSM libXtst libXi;
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
inherit alsaLib; # Needs ALSA >= 1.0.17. inherit alsaLib; # Needs ALSA >= 1.0.17.