diff options
author | cmfwyp <cmfwyp@riseup.net> | 2016-09-10 18:07:16 -0400 |
---|---|---|
committer | cmfwyp <cmfwyp@riseup.net> | 2016-09-24 00:39:35 -0400 |
commit | c015c2910693f47b641f325f66e690158c3d2652 (patch) | |
tree | 74d6428d82d3abb3483e1a7d96efb9167b68411a /pkgs/data | |
parent | 9f7d9def4c9dfff49f259fc354778208760b3b16 (diff) | |
download | nixlib-c015c2910693f47b641f325f66e690158c3d2652.tar nixlib-c015c2910693f47b641f325f66e690158c3d2652.tar.gz nixlib-c015c2910693f47b641f325f66e690158c3d2652.tar.bz2 nixlib-c015c2910693f47b641f325f66e690158c3d2652.tar.lz nixlib-c015c2910693f47b641f325f66e690158c3d2652.tar.xz nixlib-c015c2910693f47b641f325f66e690158c3d2652.tar.zst nixlib-c015c2910693f47b641f325f66e690158c3d2652.zip |
google-fonts: 2015-11-18 -> 2016-08-30
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/google-fonts/default.nix | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 0e41cd4e6b71..62e99079d177 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,15 +1,34 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "google-fonts"; - version = "2015-11-18"; + name = "google-fonts-${version}"; + version = "2016-08-30"; - src = fetchurl { - url = "https://github.com/google/fonts/archive/a26bc2b9f4ad27266c2587dc0355b3066519844a.tar.gz"; - sha256 = "1aizwzsxg30mjds1628280bs7ishgsfairnx131654gm51aihw8p"; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "7a4070f65f2ca85ffdf2d465ff5e095005bae197"; + sha256 = "0c20vcsd0jki8drrim68z2ca0cxli4wyh1i1gyg4iyac0a0v8wx3"; }; - phases = [ "unpackPhase" "installPhase" ]; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "13n2icpdp1z7i14rnfwkjdydhbjgdvyl1crd71hfy6l1j2p3kzyf"; + + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + patchPhase = '' + # These directories need to be removed because they contain + # older or duplicate versions of fonts also present in other + # directories. This causes non-determinism in the install since + # the installation order of font files with the same name is not + # fixed. + rm -rv ofl/alefhebrew \ + ofl/misssaintdelafield \ + ofl/mrbedford \ + ofl/siamreap \ + ofl/terminaldosislight + ''; installPhase = '' dest=$out/share/fonts/truetype @@ -18,10 +37,6 @@ stdenv.mkDerivation rec { chmod -x $dest/*.ttf ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0q03gg0sh2mljlbmhamnxz28d13znh9dzca84p554s7pwg6z4wca"; - meta = with stdenv.lib; { homepage = https://www.google.com/fontsl; description = "Font files available from Google Font"; |