2 files changed, 25 insertions, 4 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 5a5715dd3af7..314d29cb4b65 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, gettext, freetype, zlib
 , libungif, libpng, libjpeg, libtiff, libxml2
+, libX11 ? null , lib , xproto ? null
+, libXt ? null
 }:
 
 stdenv.mkDerivation {
@@ -14,7 +16,14 @@ stdenv.mkDerivation {
     unpackFile ${freetype.src}
     freetypeSrcPath=$(echo `pwd`/freetype-*)
     configureFlags=\"$configureFlags --with-freetype-src=$freetypeSrcPath\"
-  ";
+  "
+  + (if libX11!=null then ''
+    configureFlags="$configureFlags --with-gui=gdraw";
+  '' else "");
 
-  buildInputs = [gettext freetype zlib libungif libpng libjpeg libtiff libxml2];
+  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 c822a7d9cb97..cccb4da63a1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -522,11 +522,16 @@ rec {
 	  inherit fetchurl stdenv;
   };
 
-  fontforge = import ../tools/misc/fontforge {
+  fontforgeFun = lib.sumArgs (import ../tools/misc/fontforge) {
     inherit fetchurl stdenv gettext freetype zlib
-      libungif libpng libjpeg libtiff libxml2;
+      libungif libpng libjpeg libtiff libxml2 lib;
   };
 
+  fontforge = fontforgeFun null;
+  fontforgeX = fontforgeFun {
+    inherit (xlibs) libX11 xproto libXt;
+  } null;
+
   gawk = useFromStdenv "gawk"
     (import ../tools/text/gawk {
       inherit fetchurl stdenv;
@@ -4457,6 +4462,13 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  junicodeFun = lib.sumArgs  (selectVersion ../data/fonts/junicode "0.6.15") {
+    inherit builderDefs fontforge unzip;
+    inherit (xorg) mkfontdir mkfontscale;
+  };
+
+  junicode = junicodeFun null;
+
   freefont_ttf = import ../data/fonts/freefont-ttf {
     inherit fetchurl stdenv;
   };