Author: eelco
Date: Fri Jul 30 10:48:13 2010
New Revision: 22822
URL: https://svn.nixos.org/websvn/nix/?rev=22822&sc=1
Log:
Modified:
nixpkgs/trunk/pkgs/games/zoom/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/games/zoom/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/games/zoom/default.nix Fri Jul 30 10:17:47 2010
(r22821)
+++ nixpkgs/trunk/pkgs/games/zoom/default.nix Fri Jul 30 10:48:13 2010
(r22822)
@@ -1,14 +1,17 @@
-{stdenv, fetchurl, perl, expat, xlibs, freetype}:
+{stdenv, fetchurl, perl, expat, x11, freetype}:
# !!! assert freetype == xlibs.freetype
stdenv.mkDerivation {
name = "zoom-1.0.2alpha1";
+
src = fetchurl {
url =
http://www.logicalshift.demon.co.uk/unix/zoom/zoom-1.0.2alpha1.tar.gz;
md5 = "91b2fe444028178aa3b23bd0e3ae1a61";
};
- buildInputs = [perl expat xlibs freetype];
+
+ buildInputs = [perl expat x11 freetype];
+
# Zoom doesn't add the right directory in the include path.
CFLAGS = ["-I" (freetype + "/include/freetype2")];
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 10:17:47
2010 (r22821)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 10:48:13
2010 (r22822)
@@ -9487,8 +9487,7 @@
};
zoom = import ../games/zoom {
- inherit fetchurl stdenv perl expat freetype;
- inherit (xlibs) xlibs;
+ inherit fetchurl stdenv perl expat freetype x11;
};
keen4 = import ../games/keen4 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
