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

Merge pull request #126816 from 06kellyjac/master

Browse Source
This commit is contained in:
Sandro 2021-06-14 17:43:48 +02:00 committed by GitHub
commit ded9ec24f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/data/fonts/google-fonts/default.nix
View File

@ -1,22 +1,18 @@
{ lib
, stdenv
, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "google-fonts";
version = "unstable-2021-01-19";
version = "unstable-2021-06-12";
outputs = [ "out" "adobeBlank" ];
src = fetchFromGitHub {
owner = "google";
repo = "fonts";
rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d";
sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix";
rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc";
sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM=";
};
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
patchPhase = ''
# These directories need to be removed because they contain
# older or duplicate versions of fonts also present in other
@ -33,6 +29,8 @@ stdenv.mkDerivation {
fi
'';
dontBuild = true;
installPhase = ''
adobeBlankDest=$adobeBlank/share/fonts/truetype
install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf

4
pkgs/data/fonts/ricty/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "4.1.1";
src = fetchurl {
url = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty/ricty_generator-${version}.sh";
url = "https://rictyfonts.github.io/files/ricty_generator-${version}.sh";
sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6";
};
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high-quality Japanese font based on Inconsolata and Migu 1M";
homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html";
homepage = "https://rictyfonts.github.io";
license = licenses.unfree;
maintainers = [ maintainers.mikoim ];
};