summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-11-10 13:22:53 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-11-10 13:22:53 +0000
commit674111c1fde5a883a0da50016915740eb1646044 (patch)
treead232103617b9028f30876f3fb4c9dfb9130e54f /pkgs/data
parentcf8da224c6dbb4038b935d90df62fa70401cd11d (diff)
downloadnixlib-674111c1fde5a883a0da50016915740eb1646044.tar
nixlib-674111c1fde5a883a0da50016915740eb1646044.tar.gz
nixlib-674111c1fde5a883a0da50016915740eb1646044.tar.bz2
nixlib-674111c1fde5a883a0da50016915740eb1646044.tar.lz
nixlib-674111c1fde5a883a0da50016915740eb1646044.tar.xz
nixlib-674111c1fde5a883a0da50016915740eb1646044.tar.zst
nixlib-674111c1fde5a883a0da50016915740eb1646044.zip
Do not use ttmkfdir - claimed to be obsolete, Debian patches are going offline..
svn path=/nixpkgs/trunk/; revision=24638
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/fontWrap/default.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index fdf1a771842a..927cc48575d0 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -1,7 +1,7 @@
 args : with args;
 	let localDefs = builderDefs.passthru.function {
 		src =""; /* put a fetchurl here */
-		buildInputs = [mkfontdir mkfontscale ttmkfdir];
+		buildInputs = [mkfontdir mkfontscale];
 		configureFlags = [];
 	};
 	in with localDefs;
@@ -14,12 +14,6 @@ let
 		done
 		mkfontdir 
 		mkfontscale
-		mv fonts.scale fonts.scale.old
-		mv fonts.dir fonts.dir.old
-		ttmkfdir
-		cat fonts.dir.old >> fonts.dir
-		cat fonts.scale.old >> fonts.scale
-		rm fonts.dir.old fonts.scale.old
 	") [minInit addInputs defEnsureDir] ;
 in
 stdenv.mkDerivation rec {