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

svn path=/nixpkgs/trunk/; revision=22822

Browse Source
This commit is contained in:
Eelco Dolstra 2010-07-30 10:48:13 +00:00
parent acd34843f0
commit 3386a0e63d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/games/zoom/default.nix
View File

@ -1,14 +1,17 @@
{stdenv, fetchurl, perl, expat, xlibs, freetype}: {stdenv, fetchurl, perl, expat, x11, freetype}:
# !!! assert freetype == xlibs.freetype # !!! assert freetype == xlibs.freetype
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zoom-1.0.2alpha1"; name = "zoom-1.0.2alpha1";
src = fetchurl { src = fetchurl {
url = http://www.logicalshift.demon.co.uk/unix/zoom/zoom-1.0.2alpha1.tar.gz; url = http://www.logicalshift.demon.co.uk/unix/zoom/zoom-1.0.2alpha1.tar.gz;
md5 = "91b2fe444028178aa3b23bd0e3ae1a61"; md5 = "91b2fe444028178aa3b23bd0e3ae1a61";
}; };
buildInputs = [perl expat xlibs freetype];
buildInputs = [perl expat x11 freetype];
# Zoom doesn't add the right directory in the include path. # Zoom doesn't add the right directory in the include path.
CFLAGS = ["-I" (freetype + "/include/freetype2")]; CFLAGS = ["-I" (freetype + "/include/freetype2")];
} }

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

@ -9487,8 +9487,7 @@ let
}; };
zoom = import ../games/zoom { zoom = import ../games/zoom {
inherit fetchurl stdenv perl expat freetype; inherit fetchurl stdenv perl expat freetype x11;
inherit (xlibs) xlibs;
}; };
keen4 = import ../games/keen4 { keen4 = import ../games/keen4 {