oswald: use installFonts (#517552)

2026-05-15 23:34:20 +00:00
parent 5d87d9aaa0 8452a68839
commit 152a3ba104
1 changed files with 10 additions and 4 deletions
@@ -2,12 +2,18 @@
  lib,
  stdenvNoCC,
  fetchFromGitHub,
+  installFonts,
 }:

 stdenvNoCC.mkDerivation {
  pname = "oswald";
  version = "4.103";

+  outputs = [
+    "out"
+    "webfont"
+  ];
+
  src = fetchFromGitHub {
    owner = "googlefonts";
    repo = "OswaldFont";
@@ -15,12 +21,12 @@ stdenvNoCC.mkDerivation {
    hash = "sha256-yoUduWHuuKDQaJnQ+CgeMw1vp2lgn/OVPokSDzEU7yk=";
  };

+  nativeBuildInputs = [ installFonts ];
+
+  preInstall = "rm -r legacy/";
+
  installPhase = ''
    runHook preInstall
-
-    install -Dm444 fonts/ttf/*.ttf -t $out/share/fonts/truetype
-    install -Dm444 fonts/variable/*.ttf -t $out/share/fonts/variable
-
    runHook postInstall
  '';