diff --git a/system/fontdir.nix b/system/fontdir.nix
index 05aa67232ed3..dc8874410fb7 100644
--- a/system/fontdir.nix
+++ b/system/fontdir.nix
@@ -5,13 +5,13 @@ stdenv.mkDerivation
 	name="X11-fonts";
 	phases="installPhase";
 	fontDirs = import ./fonts.nix {inherit pkgs config;};	
-	installPhase = "
+	installCommand = "
 		mkdir -p \$out/share/X11-fonts/; 
 		for i in \$fontDirs; do
 			if ! echo \$i | egrep '~|/nix/var/nix/profiles' &>/dev/null; then
 				j=\${i#/nix/store/}
 				j=\${j%%/*}
-				if ! test -e \$out/share/X11-fonts/\${g}; then
+				if ! test -e \$out/share/X11-fonts/\${j}; then
 					ln -s \$i \$out/share/X11-fonts/\${j};
 				fi;
 			fi;
diff --git a/system/system.nix b/system/system.nix
index 2f18bc327e67..faa79f4c2a1e 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -229,7 +229,8 @@ rec {
   ]
   ++ pkgs.lib.optional (config.get ["security" "sudo" "enable"]) pkgs.sudo
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
-  ++ (config.get ["environment" "extraPackages"]) pkgs;
+  ++ (config.get ["environment" "extraPackages"]) pkgs
+  ++ pkgs.lib.optional (config.get ["fonts" "enableFontDir"]) fontDir;
 
 
   # We don't want to put all of `startPath' and `path' in $PATH, since
@@ -327,8 +328,6 @@ rec {
     inherit activateConfiguration;
     inherit grubMenuBuilder;
     inherit etc;
-	fontDir = (if config.get ["fonts" "enableFontDir"] then
-		fontDir else null);
     inherit systemPath;
     kernel = kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";