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

SDL2: some improvements to the expression.

Browse Source 
Based on comments in the pull request from @edolstra and @peti. I also added
missing metadata, setting myself as maintainer.
This commit is contained in:
Carles Pagès 2013-11-06 23:17:46 +01:00
parent b551f8bced
commit b81caba5fb
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,10 +15,8 @@ assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null; assert pulseaudioSupport -> pulseaudio != null;
let let
# force enable-static, to workaround this bug:
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
configureFlagsFun = attrs: '' configureFlagsFun = attrs: ''
--enable-static --disable-oss --disable-x11-shared --disable-oss --disable-x11-shared
--disable-pulseaudio-shared --disable-alsa-shared --disable-pulseaudio-shared --disable-alsa-shared
${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
''; '';
@ -39,6 +37,9 @@ stdenv.mkDerivation rec {
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
dontDisableStatic = true;
# 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
# to fail at doing this, hence `--disable-pulseaudio-shared'. # to fail at doing this, hence `--disable-pulseaudio-shared'.
@ -48,10 +49,17 @@ stdenv.mkDerivation rec {
configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
}; };
postInstall = ''
rm $out/lib/*.a
'';
passthru = {inherit openglSupport;}; passthru = {inherit openglSupport;};
meta = { meta = {
description = "A cross-platform multimedia library"; description = "A cross-platform multimedia library";
homepage = http://www.libsdl.org/; homepage = http://www.libsdl.org/;
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.page ];
}; };
} }