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

* SDL 1.2.13.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12092
This commit is contained in:
Eelco Dolstra 2008-06-14 20:46:34 +00:00
parent 91258d9884
commit 80b2254cbb
2 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,20 +6,28 @@ assert openglSupport -> mesa != null;
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "SDL-1.2.11"; name = "SDL-1.2.13";
src = fetchurl { src = fetchurl {
url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz; url = http://www.libsdl.org/release/SDL-1.2.13.tar.gz;
md5 = "418b42956b7cd103bfab1b9077ccc149"; sha256 = "0cp155296d6fy3w31jj481jxl9b43fkm01klyibnna8gsvqrvycl";
}; };
propagatedBuildInputs = [x11 libXrandr]; propagatedBuildInputs = [x11 libXrandr];
buildInputs =
(if openglSupport then [mesa] else []) ++ buildInputs =
(if alsaSupport then [alsaLib] else []); stdenv.lib.optional openglSupport mesa ++
configureFlags = " stdenv.lib.optional alsaSupport alsaLib;
configureFlags = ''
--disable-x11-shared --disable-alsa-shared --enable-rpath --disable-x11-shared --disable-alsa-shared --enable-rpath
${if alsaSupport then "--with-alsa-prefix=${alsaLib}/lib" else ""} ${if alsaSupport then "--with-alsa-prefix=${alsaLib}/lib" else ""}
"; '';
# patches = [./no-cxx.patch];
# NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */ passthru = {inherit openglSupport;};
inherit openglSupport;
meta = {
description = "A cross-platform multimedia library";
homepage = http://www.libsdl.org/;
};
} }

21
pkgs/development/libraries/SDL/no-cxx.patch
View File

@ -1,21 +0,0 @@
diff -rc SDL-1.2.8-orig/src/main/Makefile.in SDL-1.2.8/src/main/Makefile.in
*** SDL-1.2.8-orig/src/main/Makefile.in 2004-12-13 10:04:02.000000000 +0100
--- SDL-1.2.8/src/main/Makefile.in 2005-07-12 13:24:19.000000000 +0200
***************
*** 411,417 ****
rm -f "$${dir}/so_locations"; \
done
libarch.la: $(libarch_la_OBJECTS) $(libarch_la_DEPENDENCIES)
! $(CXXLINK) $(libarch_la_LDFLAGS) $(libarch_la_OBJECTS) $(libarch_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
--- 411,417 ----
rm -f "$${dir}/so_locations"; \
done
libarch.la: $(libarch_la_OBJECTS) $(libarch_la_DEPENDENCIES)
! $(LINK) $(libarch_la_LDFLAGS) $(libarch_la_OBJECTS) $(libarch_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
Only in SDL-1.2.8/src/main: Makefile.in~