diff options
| -rw-r--r-- | pkgs/games/zoom/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 7fbd61c3e7a96..1ca39ebc73b22 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -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")]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39a2016636f8a..7cdabe0bc4fe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9487,8 +9487,7 @@ let }; zoom = import ../games/zoom { - inherit fetchurl stdenv perl expat freetype; - inherit (xlibs) xlibs; + inherit fetchurl stdenv perl expat freetype x11; }; keen4 = import ../games/keen4 { |