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

* Latest ALSA, SDL.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6500
This commit is contained in:
Eelco Dolstra 2006-09-11 23:06:26 +00:00
parent 8dacfd90bc
commit 083699314d
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,24 @@
{stdenv, fetchurl, x11, openglSupport ? false, mesa ? null}: { stdenv, fetchurl, x11, libXrandr, openglSupport ? false, mesa ? null
, alsaSupport ? true, alsaLib ? null
}:
assert openglSupport -> mesa != null; assert openglSupport -> mesa != null;
assert alsaSupport -> alsaLib != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "SDL-1.2.9"; name = "SDL-1.2.11";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/SDL-1.2.9.tar.gz; url = http://www.libsdl.org/release/SDL-1.2.11.tar.gz;
md5 = "80919ef556425ff82a8555ff40a579a0"; md5 = "418b42956b7cd103bfab1b9077ccc149";
}; };
buildInputs = [ buildInputs = [x11 libXrandr]
x11 ++ (if openglSupport then [mesa] else [])
(if openglSupport then mesa else null) ++ (if alsaSupport then [alsaLib] else []);
]; configureFlags = "
patches = [./no-cxx.patch]; --disable-x11-shared --disable-alsa-shared --enable-rpath
NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */ ${if alsaSupport then "--with-alsa-prefix=${alsaLib}" else ""}
";
# patches = [./no-cxx.patch];
# NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */
inherit openglSupport; inherit openglSupport;
} }

6
pkgs/os-specific/linux/alsa/library/default.nix
View File

@ -1,9 +1,9 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "alsa-lib-1.0.10"; name = "alsa-lib-1.0.12";
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/alsa-lib-1.0.10.tar.bz2; url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.12.tar.bz2;
md5 = "b1a4e15c9ff81798507de470a92fcc43"; md5 = "d351d46c5e415d4c8448487737939c72";
}; };
} }

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

@ -1818,8 +1818,10 @@ rec {
readline = readline5; readline = readline5;
SDL = (import ../development/libraries/SDL) { SDL = (import ../development/libraries/SDL) {
inherit fetchurl stdenv x11 mesa; inherit fetchurl stdenv x11 mesa alsaLib;
inherit (xlibs) libXrandr;
openglSupport = true; openglSupport = true;
alsaSupport = true;
}; };
boehmgc = (import ../development/libraries/boehm-gc) { boehmgc = (import ../development/libraries/boehm-gc) {
@ -2626,6 +2628,10 @@ rec {
inherit fetchurl stdenv xlibs mesa; inherit fetchurl stdenv xlibs mesa;
}; };
exult = import ../games/exult {
inherit fetchurl stdenv SDL;
};
### MISC ### MISC