Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs
Bump wqy-zenhei font to the latest version and add wqy-microhei
This commit is contained in:
commit
dddb4f45e9
|
@ -53,6 +53,7 @@
|
|||
phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
|
||||
pierron = "Nicolas B. Pierron <nixos@nbp.name>";
|
||||
piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
|
||||
pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>";
|
||||
pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
|
||||
qknight = "Joachim Schiele <js@lastlog.de>";
|
||||
raskin = "Michael Raskin <7c6f434c@mail.ru>";
|
||||
|
|
21
pkgs/data/fonts/wqy-microhei/default.nix
Normal file
21
pkgs/data/fonts/wqy-microhei/default.nix
Normal 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;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,28 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wqy-zenhei-0.4.23-1";
|
||||
name = "wqy-zenhei-${version}";
|
||||
version = "0.9.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz;
|
||||
sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
|
||||
url = "mirror://sourceforge/wqy/${name}.tar.gz";
|
||||
sha256 = "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/share/fonts
|
||||
cp *.ttf $out/share/fonts
|
||||
install -m644 *.ttc $out/share/fonts/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -7445,6 +7445,8 @@ let
|
|||
|
||||
vistafonts = callPackage ../data/fonts/vista-fonts { };
|
||||
|
||||
wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
|
||||
|
||||
wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
|
||||
|
||||
xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
|
||||
|
|
Loading…
Reference in a new issue