Author: raskin
Date: Wed Nov 10 13:22:53 2010
New Revision: 24638
URL: https://svn.nixos.org/websvn/nix/?rev=24638&sc=1
Log:
Do not use ttmkfdir - claimed to be obsolete, Debian patches are going offline..
Modified:
nixpkgs/trunk/pkgs/data/fonts/fontWrap/default.nix
Modified: nixpkgs/trunk/pkgs/data/fonts/fontWrap/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/data/fonts/fontWrap/default.nix Wed Nov 10 12:55:25
2010 (r24637)
+++ nixpkgs/trunk/pkgs/data/fonts/fontWrap/default.nix Wed Nov 10 13:22:53
2010 (r24638)
@@ -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 @@
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 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
