b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/nasm/default.nix
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";
};
}

7
pkgs/development/libraries/SDL/default.nix
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 */
}

8
pkgs/games/generator/default.nix → pkgs/misc/emulators/generator/default.nix
View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, gtk, SDL, nasm}:
stdenv.mkDerivation {
name = "generator-0.35-cbiere-20050503";
stdenv.mkDerivation {
name = "generator-0.35-cbiere-r2";
src = fetchurl {
url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere.tar.bz2;
md5 = "bce3326c165d74e8a00e50355b653e08";
url = http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r2.tar.bz2;
md5 = "2076c20e0ad1b20d9ac15cab8cb12ad5";
};
configureFlags = "--with-gtk --with-raze --with-sdl-audio";
buildInputs = [gtk SDL nasm];

0
pkgs/games/generator/soundcard.patch → pkgs/misc/emulators/generator/soundcard.patch
View file

10
pkgs/system/all-packages-generic.nix
View file

@ -1863,11 +1863,6 @@ rec {
inherit fetchurl stdenv xlibs mesa;
};
generator = (import ../games/generator) {
inherit fetchurl stdenv SDL nasm;
inherit (gtkLibs1x) gtk;
};
### MISC
@ -1891,6 +1886,11 @@ rec {
};
*/
generator = (import ../misc/emulators/generator) {
inherit fetchurl stdenv SDL nasm;
inherit (gtkLibs1x) gtk;
};
tetex = (import ../misc/tex/tetex) {
inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
};