* Another sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
This commit is contained in:
Eelco Dolstra
2009-04-23 11:59:43 +00:00
151 changed files with 4866 additions and 3182 deletions

View File

@@ -1,9 +1,9 @@
args: with args;
{fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:
stdenv.mkDerivation {
name = "dejavu-fonts-2.23";
#fontconfig is needed only for fc-lang (?)
buildInputs = [fontforge perl perlFontTTF];
buildInputs = [fontforge perl FontTTF];
src = fetchurl {
url = mirror://sourceforge/dejavu/dejavu-fonts-2.23.tar.bz2;
sha256 = "0gifaxiianls54i05yw5gxhi2a0j9jmy5p0q58ym4l9fxv5drnhn";

View File

@@ -62,8 +62,8 @@ xkb_symbols "altgr-intl" {
key <AD08> { [ i, I, iacute, Iacute ] };
key <AD09> { [ o, O, oacute, Oacute ] };
key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
key <AD11> { [ bracketleft, braceleft, guillemotleft ] };
key <AD12> { [ bracketright,braceright, guillemotright ] };
key <AD11> { [ bracketleft, braceleft, guillemotleft, lessthanequal ] };
key <AD12> { [ bracketright,braceright, guillemotright, greaterthanequal] };
key <AC01> { [ a, A, aacute, Aacute ] };
key <AC02> { [ s, S, ssharp, section ] };