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

* NASM: updated to the latest version.

Browse Source 
* eduke: needs NASM on i686-linux.

svn path=/nixpkgs/trunk/; revision=15604
This commit is contained in:
Eelco Dolstra 2009-05-14 14:42:20 +00:00
parent 1cfc364e98
commit 120a82d7b9
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/nasm/builder.sh
View File

@ -1,6 +0,0 @@
source $stdenv/setup
mkdir -p $out/bin
mkdir -p $out/man/man1
genericBuild

17
pkgs/development/compilers/nasm/default.nix
View File

@ -1,10 +1,17 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "nasm-0.98.39";
builder = ./builder.sh;
stdenv.mkDerivation rec {
name = "nasm-2.05.01";
#builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/nasm/nasm-0.98.39.tar.bz2;
md5 = "2032ad44c7359f7a9a166a40a633e772";
url = "mirror://sourceforge/nasm/${name}.tar.bz2";
sha256 = "0p2rlshd68m2h7psyjz4440grxwryxppqzchx7cbmzahqr2yy1lj";
};
meta = {
homepage = http://www.nasm.us/;
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
};
}

9
pkgs/games/eduke32/default.nix
View File

@ -1,13 +1,18 @@
{stdenv, fetchurl, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, makeDesktopItem}:
{stdenv, fetchurl, SDL, SDL_mixer, unzip, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
stdenv.mkDerivation rec {
name = "eduke32";
src = fetchurl {
url = http://wiki.eduke32.com/stuff/source_code/eduke32_src_20090131.zip;
sha256 = "e6b8cc2c7e0c32a6aa5a64359be8b8c494dcae08dda87e1de718c030426ef74d";
};
buildInputs = [ unzip SDL SDL_mixer libvorbis mesa gtk pkgconfig ];
buildInputs = [ unzip SDL SDL_mixer libvorbis mesa gtk pkgconfig ]
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
NIX_LDFLAGS = "-lgcc_s";
desktopItem = makeDesktopItem {
name = "eduke32";
exec = "eduke32-wrapper";

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

@ -7189,7 +7189,7 @@ let
};
eduke32 = import ../games/eduke32 {
inherit stdenv fetchurl SDL SDL_mixer unzip libvorbis mesa pkgconfig makeDesktopItem;
inherit stdenv fetchurl SDL SDL_mixer unzip libvorbis mesa pkgconfig nasm makeDesktopItem;
inherit (gtkLibs) gtk;
};