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

SDL: propagate libcap and fixup native inputs

Browse Source 
Close #8205.
All inputs except pkgconfig shouldn't be native but rather disabled on
cygwin, I suppose.
This commit is contained in:
Vladimír Čunát 2015-06-08 11:13:46 +02:00
parent 317f4ea72d
commit 043a8478c3
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,9 @@ assert x11Support -> (x11 != null && libXrandr != null);
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> libpulseaudio != null; assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.15"; version = "1.2.15";
name = "SDL-${version}"; name = "SDL-${version}";
@ -23,19 +26,19 @@ stdenv.mkDerivation rec {
sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
}; };
nativeBuildInputs = [ pkgconfig ];
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedNativeBuildInputs = propagatedBuildInputs =
stdenv.lib.optionals x11Support [ x11 libXrandr ] ++ optionals x11Support [ x11 libXrandr ] ++
stdenv.lib.optional alsaSupport alsaLib ++ optional alsaSupport alsaLib ++
stdenv.lib.optional pulseaudioSupport libpulseaudio; optional stdenv.isLinux libcap ++
optional openglSupport mesa ++
optional pulseaudioSupport libpulseaudio;
buildInputs = let buildInputs = let
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
in stdenv.lib.optional stdenv.isLinux libcap in optional notMingw audiofile;
++ (stdenv.lib.optional notMingw audiofile);
nativeBuildInputs = [ pkgconfig ] ++
stdenv.lib.optional openglSupport [ mesa ];
# 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

2
pkgs/development/libraries/SDL2/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional pulseaudioSupport libpulseaudio; stdenv.lib.optional pulseaudioSupport libpulseaudio;
buildInputs = [ pkgconfig audiofile ] ++ buildInputs = [ pkgconfig audiofile ] ++
stdenv.lib.optional openglSupport [ mesa ] ++ stdenv.lib.optional openglSupport mesa ++
stdenv.lib.optional alsaSupport alsaLib; stdenv.lib.optional alsaSupport alsaLib;
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431 # https://bugzilla.libsdl.org/show_bug.cgi?id=1431

10
pkgs/top-level/all-packages.nix
View File

@ -7841,9 +7841,9 @@ let
SDL = callPackage ../development/libraries/SDL { SDL = callPackage ../development/libraries/SDL {
openglSupport = mesaSupported; openglSupport = mesaSupported;
alsaSupport = (!stdenv.isDarwin); alsaSupport = stdenv.isLinux;
x11Support = true; x11Support = !stdenv.isCygwin;
pulseaudioSupport = (!stdenv.isDarwin); pulseaudioSupport = stdenv.isLinux;
}; };
SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; SDL_gfx = callPackage ../development/libraries/SDL_gfx { };
@ -7862,8 +7862,8 @@ let
SDL2 = callPackage ../development/libraries/SDL2 { SDL2 = callPackage ../development/libraries/SDL2 {
openglSupport = mesaSupported; openglSupport = mesaSupported;
alsaSupport = (!stdenv.isDarwin); alsaSupport = stdenv.isLinux;
x11Support = (!stdenv.isDarwin); x11Support = !stdenv.isCygwin;
pulseaudioSupport = false; # better go through ALSA pulseaudioSupport = false; # better go through ALSA
}; };