summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries/SDL2
diff options
context:
space:
mode:
authorCarles Pagès <page@cubata.homelinux.net>2013-11-06 23:17:46 +0100
committerCarles Pagès <page@cubata.homelinux.net>2013-11-06 23:17:46 +0100
commitb81caba5fbb49012a5cabefb672f3b83bd524d1e (patch)
tree82a9472e272472a7d8725c06faaa0c8073085ac5 /pkgs/development/libraries/SDL2
parentb551f8bced96fa069d41007faf5a9eb6f5974e92 (diff)
SDL2: some improvements to the expression.
Based on comments in the pull request from @edolstra and @peti. I also added missing metadata, setting myself as maintainer.
Diffstat (limited to 'pkgs/development/libraries/SDL2')
-rw-r--r--pkgs/development/libraries/SDL2/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 8da6fefd1aa4..c3b33dfaf620 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -15,10 +15,8 @@ assert alsaSupport -> alsaLib != null;
assert pulseaudioSupport -> pulseaudio != null;
let
- # force enable-static, to workaround this bug:
- # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
configureFlagsFun = attrs: ''
- --enable-static --disable-oss --disable-x11-shared
+ --disable-oss --disable-x11-shared
--disable-pulseaudio-shared --disable-alsa-shared
${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 alsaSupport alsaLib;
+ # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+ dontDisableStatic = true;
+
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems
# to fail at doing this, hence `--disable-pulseaudio-shared'.
@@ -48,10 +49,17 @@ stdenv.mkDerivation rec {
configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
};
+ postInstall = ''
+ rm $out/lib/*.a
+ '';
+
passthru = {inherit openglSupport;};
meta = {
description = "A cross-platform multimedia library";
homepage = http://www.libsdl.org/;
+ license = stdenv.lib.licenses.zlib;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.page ];
};
}