about summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2020-12-20 12:22:10 +0000
committerGitHub <noreply@github.com>2020-12-20 12:22:10 +0000
commit92db8d3c2679636849c523d5e5a4a405637731e2 (patch)
tree2c61f95cd78ae781954fede1d2431a8ed52cc0f7 /pkgs/data
parentbb9b5c5b753e187177e687baded6a6a87a21fb1d (diff)
parente45d9000b5375210ab584cea111c767d578ab74e (diff)
downloadnixlib-92db8d3c2679636849c523d5e5a4a405637731e2.tar
nixlib-92db8d3c2679636849c523d5e5a4a405637731e2.tar.gz
nixlib-92db8d3c2679636849c523d5e5a4a405637731e2.tar.bz2
nixlib-92db8d3c2679636849c523d5e5a4a405637731e2.tar.lz
nixlib-92db8d3c2679636849c523d5e5a4a405637731e2.tar.xz
nixlib-92db8d3c2679636849c523d5e5a4a405637731e2.tar.zst
nixlib-92db8d3c2679636849c523d5e5a4a405637731e2.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/stix-two/default.nix27
1 files changed, 12 insertions, 15 deletions
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix
index e6e4009020ae..1e32ebbf16a9 100644
--- a/pkgs/data/fonts/stix-two/default.nix
+++ b/pkgs/data/fonts/stix-two/default.nix
@@ -1,25 +1,22 @@
-{ stdenv, fetchFromGitHub }:
-
+{ lib, fetchzip }:
 let
-  version = "2.0.2";
-in fetchFromGitHub {
+  version = "2.10";
+in
+fetchzip {
   name = "stix-two-${version}";
 
-  owner = "stipub";
-  repo = "stixfonts";
-  rev = "v${version}";
+  url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip";
+
+  sha256 = "1xvh5c5asbasfa333mizimvdp209g0lppbwv2p0cg3ixfpxgq4dl";
 
   postFetch = ''
-    tar xf $downloadedFile --strip=1
-    install -m444 -Dt $out/share/fonts/opentype/ OTF/*.otf
-    install -m444 -Dt $out/share/fonts/woff/     WOFF/*.woff
-    install -m444 -Dt $out/share/fonts/woff2/    WOFF2/*.woff2
+    mkdir -p $out/share/fonts/
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
   '';
 
-  sha256 = "1ah8s0cb67yv4ll8zfs01mdh9m5i2lbkrfbmkhi1xdid6pxsk32x";
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.stixfonts.org/";
+  meta = with lib; {
+    homepage = "https://www.stixfonts.org/";
     description = "Fonts for Scientific and Technical Information eXchange";
     license = licenses.ofl;
     platforms = platforms.all;