* Updated SDL, NASM and Generator to the latest versions.

* Moved Generator to the misc/emulators directory.

svn path=/nixpkgs/trunk/; revision=4330
This commit is contained in:
Eelco Dolstra
2005-12-03 01:33:18 +00:00
parent 5da5239588
commit b6befed50e
5 changed files with 16 additions and 15 deletions

View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "nasm-0.98.38";
name = "nasm-0.98.39";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/nasm-0.98.38.tar.bz2;
md5 = "9f682490c132b070d54e395cb6ee145e";
url = http://surfnet.dl.sourceforge.net/sourceforge/nasm/nasm-0.98.39.tar.bz2;
md5 = "2032ad44c7359f7a9a166a40a633e772";
};
}

View File

@@ -1,11 +1,12 @@
{stdenv, fetchurl, x11}:
stdenv.mkDerivation {
name = "SDL-1.2.8";
name = "SDL-1.2.9";
src = fetchurl {
url = http://www.libsdl.org/release/SDL-1.2.8.tar.gz;
md5 = "37aaf9f069f9c2c18856022f35de9f8c";
url = http://www.libsdl.org/release/SDL-1.2.9.tar.gz;
md5 = "80919ef556425ff82a8555ff40a579a0";
};
buildInputs = [x11];
patches = [./no-cxx.patch];
NIX_CFLAGS_COMPILE = "-DBITS_PER_LONG=32"; /* !!! hack around kernel header bug */
}