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

Propagate GDBM from PulseAudio to make hints from `.la' files work.

Browse source 
svn path=/nixpkgs/trunk/; revision=15556
This commit is contained in:
Ludovic Courtès 2009-05-11 21:11:25 +00:00
parent 777f805eba
commit a80578b312
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/SDL/default.nix
View file

@ -16,12 +16,13 @@ stdenv.mkDerivation {
sha256 = "0cp155296d6fy3w31jj481jxl9b43fkm01klyibnna8gsvqrvycl";
};
propagatedBuildInputs = [x11 libXrandr];
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs = [ x11 libXrandr ] ++
stdenv.lib.optional pulseaudioSupport pulseaudio;
buildInputs = [ pkgconfig ] ++
stdenv.lib.optional openglSupport mesa ++
stdenv.lib.optional alsaSupport alsaLib ++
stdenv.lib.optional pulseaudioSupport pulseaudio;
stdenv.lib.optional alsaSupport alsaLib;
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems

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

@ -10,8 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0lwd5rcppyvcvy9n2j074k5mydgqszfvw6fnsjlz46gkda9vgydq";
};
# Since `libpulse*.la' contain `-lgdbm', it must be propagated.
propagatedBuildInputs = [ gdbm ];
buildInputs = [
pkgconfig gnum4 gdbm libtool glib dbus hal avahi gconf liboil
pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
libsamplerate libsndfile speex alsaLib
libX11 libICE libSM
intltool gettext