Merge master into x-updates

2014-02-16 11:45:02 +01:00
parent 9a86ad2f7f 26d7645b6b
commit 96f07fa74e
434 changed files with 4678 additions and 1227 deletions
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
 	name = "wrapped-font-dir";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [ doInstall doForceShare doPropagate]);
+  preferLocalBuild = true;
 	meta = {
 		description = "
 		Just a wrapper to create fonts.dir and fonts.scale .