From 56d018e6a28d125086ecc4f7159d938f358f7b88 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Wed, 1 Apr 2026 14:08:42 -0400
Subject: [PATCH] merriweather: 2.005 -> 2.200

---
 pkgs/by-name/me/merriweather/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/me/merriweather/package.nix b/pkgs/by-name/me/merriweather/package.nix
index 87f38e6b14d2..83474cc5ca0d 100644
--- a/pkgs/by-name/me/merriweather/package.nix
+++ b/pkgs/by-name/me/merriweather/package.nix
@@ -2,29 +2,29 @@
   stdenvNoCC,
   lib,
   fetchFromGitHub,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "merriweather";
-  version = "2.005";
+  version = "2.200";
 
   src = fetchFromGitHub {
     owner = "SorkinType";
     repo = "Merriweather";
-    rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a";
-    sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29";
+    rev = "6e3263d6241aeb747ebfcdd4af3ff8bd1013bb49";
+    sha256 = "sha256-mpVJpxI98VxHpZMFFyTHjxTPcUTB1kK8XCGa32znMcQ=";
   };
 
   # TODO: it would be nice to build this from scratch, but lots of
   # Python dependencies to package (fontmake, gftools)
 
-  installPhase = ''
-    install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf
-    install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
-    install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
-    install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
-    # TODO: install variable version?
-  '';
+  nativeBuildInputs = [ installFonts ];
+
+  outputs = [
+    "out"
+    "webfont"
+  ];
 
   meta = {
     homepage = "https://github.com/SorkinType/Merriweather";