about summary refs log tree commit diff
path: root/nixpkgs/pkgs/data/fonts/montserrat/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/data/fonts/montserrat/default.nix')
-rw-r--r--nixpkgs/pkgs/data/fonts/montserrat/default.nix37
1 files changed, 18 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/data/fonts/montserrat/default.nix b/nixpkgs/pkgs/data/fonts/montserrat/default.nix
index de8ea80b0175..41135122f054 100644
--- a/nixpkgs/pkgs/data/fonts/montserrat/default.nix
+++ b/nixpkgs/pkgs/data/fonts/montserrat/default.nix
@@ -1,29 +1,28 @@
-# Originally packaged for ArchLinux.
-#
-# https://aur.archlinux.org/packages/ttf-montserrat/
-
-{ lib, fetchzip }:
+{ lib, fetchFromGitHub }:
 
 let
-  version = "1.0";
-in fetchzip {
-  name = "montserrat-${version}";
-
-  url = "https://marvid.fr/~eeva/mirror/Montserrat.tar.gz";
+  pname = "montserrat";
+  version = "7.210";
+in fetchFromGitHub {
+  name = "${pname}-${version}";
+  owner = "JulietaUla";
+  repo = pname;
+  rev = "v${version}";
+  sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U=";
 
   postFetch = ''
-    tar -xzf $downloadedFile --strip-components=1
-    mkdir -p $out/share/fonts/montserrat
-    cp *.ttf $out/share/fonts/montserrat
+    tar xf $downloadedFile --strip 1
+    install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf
+    install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf
+    install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff
+    install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2
   '';
 
-  sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w";
-
   meta = with lib; {
     description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)";
-    homepage    = "https://www.fontspace.com/julieta-ulanovsky/montserrat";
-    license     = licenses.ofl;
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ scolobb ];
+    homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ scolobb jk ];
   };
 }