public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PulseAudio 0.9.21. 

svn path=/nixpkgs/trunk/; revision=18923
This commit is contained in:
Ludovic Courtès 2009-12-13 20:19:19 +00:00
parent f4e365b3a0
commit c7991b8a2b
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/servers/pulseaudio/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
, gconf, liboil, libX11, libICE, libSM, intltool, gettext, alsaLib , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
, libsamplerate, libsndfile, speex, ... }: , libcap, alsaLib, libsamplerate, libsndfile, speex }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pulseaudio-0.9.13"; name = "pulseaudio-0.9.21";
src = fetchurl { src = fetchurl {
url = "http://0pointer.de/lennart/projects/pulseaudio/${name}.tar.gz"; url = "http://0pointer.de/lennart/projects/pulseaudio/${name}.tar.gz";
sha256 = "0lwd5rcppyvcvy9n2j074k5mydgqszfvw6fnsjlz46gkda9vgydq"; sha256 = "0m72rrbgy9qncwhqsq9q35niicy6i06sk3g5i8w9bvkhmib27qll";
}; };
# Since `libpulse*.la' contain `-lgdbm', it must be propagated. # Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@ -15,25 +15,24 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
libsamplerate libsndfile speex alsaLib libsamplerate libsndfile speex alsaLib libcap
libX11 libICE libSM gtk libX11 libICE libSM libXtst libXi
intltool gettext intltool gettext
]; ];
preConfigure = '' 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'
# Change the `padsp' script so that it contains the full path to # Change the `padsp' script so that it contains the full path to
# `libpulsedsp.so'. # `libpulsedsp.so'.
sed -i "src/utils/padsp" \ sed -i "src/utils/padsp" \
-e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g" -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g"
# Move the udev rules under $(prefix).
sed -i "src/Makefile.in" \
-e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
''; '';
configureFlags = '' configureFlags = ''
--disable-solaris --disable-jack --disable-bluez --disable-polkit --with-x --enable-asyncdns --localstatedir=/var --disable-solaris --disable-udev --disable-jack --disable-bluez --localstatedir=/var
''; '';
meta = { meta = {

9
pkgs/top-level/all-packages.nix
View File

@ -4995,14 +4995,11 @@ 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 hal avahi liboil libsamplerate libsndfile speex
intltool gettext glib; intltool gettext libtool libcap;
inherit (xlibs) libX11 libICE libSM; inherit (xlibs) libX11 libICE libSM libXtst libXi;
inherit (gtkLibs) gtk glib;
inherit alsaLib; # Needs ALSA >= 1.0.17. inherit alsaLib; # Needs ALSA >= 1.0.17.
gconf = gnome.GConf; gconf = gnome.GConf;
# Work around Libtool 1.5 interaction with Ltdl 2.x
# ("undefined reference to lt__PROGRAM__LTX_preloaded_symbols").
libtool = libtool_1_5;
}; };
tomcat_connectors = import ../servers/http/apache-modules/tomcat-connectors { tomcat_connectors = import ../servers/http/apache-modules/tomcat-connectors {