From 28229d8ef13fdbdb82ffa46eae8badae9de7ac56 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 22 Apr 2014 05:54:39 +0200 Subject: [PATCH] SDL: Add alsaLib to propagatedNativeBuildInputs. 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 --- pkgs/development/libraries/SDL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index ee3640fe64b4..110bfc01520f 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedNativeBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ + stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional pulseaudioSupport pulseaudio; buildInputs = let @@ -33,8 +34,7 @@ stdenv.mkDerivation rec { in stdenv.lib.optional notMingw audiofile; nativeBuildInputs = [ pkgconfig ] ++ - stdenv.lib.optional openglSupport [ mesa ] ++ - stdenv.lib.optional alsaSupport alsaLib; + stdenv.lib.optional openglSupport [ mesa ]; # XXX: By default, SDL wants to dlopen() PulseAudio, in which case # we must arrange to add it to its RPATH; however, `patchelf' seems