diff options
author | Shea Levy <shea@shealevy.com> | 2014-03-15 13:22:31 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-03-15 13:22:31 -0400 |
commit | dddb4f45e99a55cf648d138421887ce46e9b6333 (patch) | |
tree | 356b708fde8e0e1b89a28b8cba83c899ef478423 | |
parent | 80ed0ff85f1e24bfdc9f4db0c64568828f0c287b (diff) | |
parent | eb295a62f21203e520f0017737b6288758c6c925 (diff) |
Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs
Bump wqy-zenhei font to the latest version and add wqy-microhei
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/data/fonts/wqy-microhei/default.nix | 21 | ||||
-rw-r--r-- | pkgs/data/fonts/wqy-zenhei/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 35 insertions, 4 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e92177ded4b33..8d6c613fd0f83 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -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>"; diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix new file mode 100644 index 0000000000000..065bb4bc828f3 --- /dev/null +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -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; + }; +} + diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 960c74f68413c..d42665c69ccaa 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fc4e43207340..a43452e899c9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |