1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 7e286d0800b..96303b19bc5 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -3,12 +3,22 @@
 assert freetype != null && expat != null;
 
 stdenv.mkDerivation {
-  name = "fontconfig-2.4.2";
-  builder = ./builder.sh;
+  name = "fontconfig-2.6.0";
+  
   src = fetchurl {
-    url = http://fontconfig.org/release/fontconfig-2.4.2.tar.gz;
-    sha256 = "0qqk6hqh8ardqlgzdgj0zjn6a61z4j6ba9x3xs8pp0c2650xd8v3";
+    url = http://fontconfig.org/release/fontconfig-2.6.0.tar.gz;
+    sha256 = "19fqr2vh7rzpqfh2lnkymh7q5pxn9r4w2z35lh36crp5l3m3k9m9";
   };
+  
   buildInputs = [freetype];
   propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks
+
+  preConfigure = ''
+    configureFlags="--with-confdir=$out/etc/fonts --disable-docs --with-default-fonts="
+  '';
+
+  meta = {
+    description = "A library for font customization and configuration";
+    homepage = http://fontconfig.org/;
+  };  
 }