* Updated the generator to handle some missing dependencies.

Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
This commit is contained in:
Eelco Dolstra
2009-04-20 16:02:50 +00:00
parent b1e2bb54f2
commit 077b0157a0
6 changed files with 99 additions and 99 deletions

View File

@@ -1,7 +1,5 @@
{stdenv, fetchurl, freetype, expat}:
assert freetype != null && expat != null;
stdenv.mkDerivation {
name = "fontconfig-2.6.0";

View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "freetype-2.3.7";
stdenv.mkDerivation rec {
name = "freetype-2.3.9";
src = fetchurl {
url = mirror://sourceforge/freetype/freetype-2.3.7.tar.bz2;
sha256 = "12787v5q083zwrpfh0sk87g4ac0yzzmjmw41k5k27hwznsg8gksf";
url = "mirror://sourceforge/freetype/${name}.tar.bz2";
sha256 = "1dia4j01aqdcrkpfkcniswcrccdx4jx2p3hyhbh76kchx6y3782i";
};
meta = {