public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs

Browse Source 
Bump wqy-zenhei font to the latest version and add wqy-microhei
This commit is contained in:
Shea Levy 2014-03-15 13:22:31 -04:00
commit dddb4f45e9
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -53,6 +53,7 @@
phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>"; phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
pierron = "Nicolas B. Pierron <nixos@nbp.name>"; pierron = "Nicolas B. Pierron <nixos@nbp.name>";
piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>"; piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>";
pSub = "Pascal Wittmann <mail@pascal-wittmann.de>"; pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
qknight = "Joachim Schiele <js@lastlog.de>"; qknight = "Joachim Schiele <js@lastlog.de>";
raskin = "Michael Raskin <7c6f434c@mail.ru>"; raskin = "Michael Raskin <7c6f434c@mail.ru>";

21
pkgs/data/fonts/wqy-microhei/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "wqy-microhei-0.2.0-beta";
src = fetchurl {
url = "mirror://sourceforge/wqy/${name}.tar.gz";
sha256 = "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8";
};
installPhase = ''install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc'';
meta = {
description = "A (mainly) Chinese Unicode font";
homepage = "http://wenq.org";
license = stdenv.lib.licenses.asl20;
maintainers = stdenv.lib.maintainers.pkmx;
platforms = stdenv.lib.platforms.all;
};
}

15
pkgs/data/fonts/wqy-zenhei/default.nix
View File

@ -1,21 +1,28 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wqy-zenhei-0.4.23-1"; name = "wqy-zenhei-${version}";
version = "0.9.45";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz; url = "mirror://sourceforge/wqy/${name}.tar.gz";
sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm"; sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4";
}; };
dontBuild = true;
installPhase = installPhase =
'' ''
mkdir -p $out/share/fonts mkdir -p $out/share/fonts
cp *.ttf $out/share/fonts install -m644 *.ttc $out/share/fonts/
''; '';
meta = { meta = {
description = "A (mainly) Chinese Unicode font"; description = "A (mainly) Chinese Unicode font";
homepage = "http://wenq.org";
license = stdenv.lib.licenses.gpl2; # with font embedding exceptions
maintainers = stdenv.lib.maintainers.pkmx;
platforms = stdenv.lib.platforms.all;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7445,6 +7445,8 @@ let
vistafonts = callPackage ../data/fonts/vista-fonts { }; vistafonts = callPackage ../data/fonts/vista-fonts { };
wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { }; wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { }; xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };