about summary refs log tree commit diff
path: root/nixpkgs/pkgs/data
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-07-30 11:43:04 +0000
committerAlyssa Ross <hi@alyssa.is>2019-07-30 11:43:04 +0000
commitb66eba4dc23a075b41841d7c544678f81de3f8c8 (patch)
tree4fd7bccfcd54df064ca5eea2d2dcd83b2655d0c6 /nixpkgs/pkgs/data
parentc54ba5f5455f43974e1cdcce2170eb3988e24af6 (diff)
downloadnixlib-b66eba4dc23a075b41841d7c544678f81de3f8c8.tar
nixlib-b66eba4dc23a075b41841d7c544678f81de3f8c8.tar.gz
nixlib-b66eba4dc23a075b41841d7c544678f81de3f8c8.tar.bz2
nixlib-b66eba4dc23a075b41841d7c544678f81de3f8c8.tar.lz
nixlib-b66eba4dc23a075b41841d7c544678f81de3f8c8.tar.xz
nixlib-b66eba4dc23a075b41841d7c544678f81de3f8c8.tar.zst
nixlib-b66eba4dc23a075b41841d7c544678f81de3f8c8.zip
noto-fonts-cjk: use fetchFromGitHub
Diffstat (limited to 'nixpkgs/pkgs/data')
-rw-r--r--nixpkgs/pkgs/data/fonts/noto-fonts/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
index 5043e031c08f..72a58556d99c 100644
--- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
+++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
@@ -57,14 +57,18 @@ rec {
     weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
     sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq";
   };
-  noto-fonts-cjk = let version = "1.004"; in fetchzip {
+  noto-fonts-cjk = let version = "1.004"; in fetchFromGitHub rec {
     name = "noto-fonts-cjk-${version}";
 
     # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file
-    url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip";
+    owner = "googlei18n";
+    repo = "noto-cjk";
+    rev = "40d9f5b179a59a06b98373c76bdc3e2119e4e6b2";
+
     postFetch = ''
-      mkdir -p $out/share/fonts
-      unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto
+      mkdir -p $out/share/fonts/noto
+      tar xOf $downloadedFile noto-cjk-${rev}/NotoSansCJK.ttc.zip |
+          funzip > $out/share/fonts/noto/NotoSansCJK.ttc
     '';
     sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq";