* Renamed pkgs-ng to pkgs.

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

pkgs/development/libraries/fontconfig/builder.sh

@@ -0,0 +1,18 @@
+#! /bin/sh
+
+buildinputs="$freetype $expat $x11 $ed"
+. $stdenv/setup || exit 1
+
+# Fontconfig generates a bad `fonts.conf' file is the timezone is not known
+# (because it calls `date').
+export TZ=UTC
+
+tar xvfz $src || exit 1
+cd fontconfig-* || exit 1
+./configure --prefix=$out --with-confdir=$out/etc/fonts \
+ --x-includes=$x11/include --x-libraries=$x11/lib \
+ --with-expat-includes=$expat/include --with-expat-lib=$expat/lib || exit 1
+make || exit 1
+make install || exit 1
+
+echo "$freetype" > $out/propagated-build-inputs || exit 1

pkgs/development/libraries/fontconfig/default.fix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, x11, freetype, expat, ed}:
+
+assert !isNull x11 && x11.buildClientLibs;
+assert !isNull freetype;
+assert !isNull expat;
+assert !isNull ed;
+
+derivation {
+  name = "fontconfig-2.2.90";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://pdx.freedesktop.org/software/fontconfig/releases/fontconfig-2.2.90.tar.gz;
+    md5 = "5cb87476743be1bbf1674ed72a76ae6a";
+  };
+  stdenv = stdenv;
+  x11 = x11;
+  freetype = freetype;
+  expat = expat;
+  ed = ed;
+}