* More freedesktop.org X11 modules.

* Cleaned up some packages.

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

pkgs/development/libraries/fontconfig/builder.sh

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

pkgs/development/libraries/fontconfig/default.nix

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