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

SDL: Add alsaLib to propagatedNativeBuildInputs.

Browse Source 
This is needed because the pkgconfig file contains linker flags for
alsa-lib. And we had it propagated before already.

Should fix build of quite a lot of SDL dependencies, such as SDL_image:

https://hydra.nixos.org/build/10558332

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-04-22 05:54:39 +02:00
parent 2a4282c811
commit 28229d8ef1
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/SDL/default.nix
View File

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedNativeBuildInputs = propagatedNativeBuildInputs =
stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
stdenv.lib.optional alsaSupport alsaLib ++
stdenv.lib.optional pulseaudioSupport pulseaudio; stdenv.lib.optional pulseaudioSupport pulseaudio;
buildInputs = let buildInputs = let
@ -33,8 +34,7 @@ stdenv.mkDerivation rec {
in stdenv.lib.optional notMingw audiofile; in stdenv.lib.optional notMingw audiofile;
nativeBuildInputs = [ pkgconfig ] ++ nativeBuildInputs = [ pkgconfig ] ++
stdenv.lib.optional openglSupport [ mesa ] ++ stdenv.lib.optional openglSupport [ mesa ];
stdenv.lib.optional alsaSupport alsaLib;
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems # we must arrange to add it to its RPATH; however, `patchelf' seems