diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 314d29cb4b6..839ec49d93c 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, gettext, freetype, zlib
 , libungif, libpng, libjpeg, libtiff, libxml2
-, libX11 ? null , lib , xproto ? null
-, libXt ? null
+, libX11 ? null, lib, xproto ? null, libXt ? null
 }:
 
 stdenv.mkDerivation {
@@ -11,19 +10,24 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/fontforge/fontforge_full-20070808.tar.bz2;
     sha256 = "1b3x5djn9ifvszwmgwmn1jwl50pbq6fzvbmgx0qjg0m60m3v44nx";
   };
-
-  preConfigure = "
+    
+  configureFlags = if libX11 != null then "--with-gui=gdraw" else "";
+  
+  preConfigure = ''
     unpackFile ${freetype.src}
     freetypeSrcPath=$(echo `pwd`/freetype-*)
-    configureFlags=\"$configureFlags --with-freetype-src=$freetypeSrcPath\"
-  "
-  + (if libX11!=null then ''
-    configureFlags="$configureFlags --with-gui=gdraw";
-  '' else "");
+    configureFlags="$configureFlags --with-freetype-src=$freetypeSrcPath"
+    
+    substituteInPlace configure \
+      --replace /usr/include /no-such-path \
+      --replace /usr/lib /no-such-path \
+      --replace /usr/local /no-such-path \
+  '';
 
-  buildInputs = [gettext freetype zlib libungif libpng libjpeg libtiff libxml2]
-  ++ (lib.optional (libX11!=null) libX11)
-  ++ (lib.optional (xproto!=null) xproto)
-  ++ (lib.optional (libXt!=null) libXt)
-  ;
+  buildInputs =
+    [gettext freetype zlib libungif libpng libjpeg libtiff libxml2]
+    ++ lib.optional (libX11 != null) libX11
+    ++ lib.optional (xproto != null) xproto
+    ++ lib.optional (libXt != null) libXt
+    ;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14ccedcbc17..8713ae5237b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -587,15 +587,16 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  fontforgeFun = lib.sumArgs (import ../tools/misc/fontforge) {
+  fontforge = import ../tools/misc/fontforge {
     inherit fetchurl stdenv gettext freetype zlib
       libungif libpng libjpeg libtiff libxml2 lib;
   };
 
-  fontforge = fontforgeFun null;
-  fontforgeX = fontforgeFun {
+  fontforgeX = import ../tools/misc/fontforge {
+    inherit fetchurl stdenv gettext freetype zlib
+      libungif libpng libjpeg libtiff libxml2 lib;
     inherit (xlibs) libX11 xproto libXt;
-  } null;
+  };
 
   gawk = useFromStdenv "gawk"
     (import ../tools/text/gawk {