diff options
Diffstat (limited to 'pkgs/development/libraries/SDL2/default.nix')
| -rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 68f40cad259..7573d1e1cd2 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, audiofile , openglSupport ? false, mesa ? null , alsaSupport ? true, alsaLib ? null -, x11Support ? true, x11 ? null, libXrandr ? null -, pulseaudioSupport ? true, pulseaudio ? null +, x11Support ? true, xlibsWrapper ? null, libXrandr ? null +, pulseaudioSupport ? true, libpulseaudio ? null }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -10,15 +10,16 @@ assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (x11 != null && libXrandr != null); +assert x11Support -> (xlibsWrapper != null && libXrandr != null); assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> pulseaudio != null; +assert pulseaudioSupport -> libpulseaudio != null; let configureFlagsFun = attrs: '' --disable-oss --disable-x11-shared --disable-pulseaudio-shared --disable-alsa-shared ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} + ${if (!x11Support) then "--without-x" else ""} ''; in stdenv.mkDerivation rec { @@ -30,11 +31,11 @@ stdenv.mkDerivation rec { }; # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ - stdenv.lib.optional pulseaudioSupport pulseaudio; + propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ + stdenv.lib.optional pulseaudioSupport libpulseaudio; buildInputs = [ pkgconfig audiofile ] ++ - stdenv.lib.optional openglSupport [ mesa ] ++ + stdenv.lib.optional openglSupport mesa ++ stdenv.lib.optional alsaSupport alsaLib; # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 |