diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 6acd0bf66d9b..75c3a63c0a33 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -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 diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index c99b8d608b63..73e63bebdc03 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -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