From 318c7475203fa791ba098debe809138e40652b80 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2012 09:47:23 +0000
Subject: [PATCH] Update and fix DejaVu fonts

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33370
---
 pkgs/data/fonts/dejavu-fonts/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 505746b3edf..3b02fd39cf6 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -1,14 +1,24 @@
 {fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:
 
-let version = "2.29" ; in
+let version = "2.33" ; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "dejavu-fonts-${version}";
   #fontconfig is needed only for fc-lang (?)
   buildInputs = [fontforge perl FontTTF];
+
+  unicodeData = fetchurl {
+    url = http://www.unicode.org/Public/6.1.0/ucd/UnicodeData.txt ; 
+    sha256 = "1bd6zkzvxfnifrn5nh171ywk7q56sgk8gdvdn43z9i53hljjcrih";
+  };
+  blocks = fetchurl {
+    url = http://www.unicode.org/Public/6.1.0/ucd/Blocks.txt; 
+    sha256 = "0w0vkb09nrlc6mrhqyl9npszdi828afgvhvlb1vs5smjv3h8y3dz";
+  };
+
   src = fetchurl {
     url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";
-    sha256 = "1h8x0bnbh9awwsxiwjpp73iczk1y4d5y0as1f4zb4pbk6l2m7v60";
+    sha256 = "10m0rds36yyaznfqaa9msayv6f0v1h50zbikja6qdy5dwwxi8q5w";
   };
   preBuild = ''
     sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/*
@@ -16,7 +26,8 @@ stdenv.mkDerivation {
     mkdir resources
     tar xf ${fontconfig.src} --wildcards '*/fc-lang'
     ln -s $PWD/fontconfig-*/fc-lang -t resources/
-    ln -s ${perl}/lib/*/*/unicore/* -t resources/
+    ln -s ${unicodeData} resources/UnicodeData.txt
+    ln -s ${blocks} resources/Blocks.txt
   '';
   installPhase = '' 
     mkdir -p $out/share/fonts/truetype