From bf6d12cbd8435e95bd1616c82a2f924a7da62bcc Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 28 May 2026 23:17:39 +0200 Subject: [PATCH 1/2] material-design-icons: use installFonts --- .../ma/material-design-icons/package.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ma/material-design-icons/package.nix b/pkgs/by-name/ma/material-design-icons/package.nix index 88c7e5768793..8a4d7b734137 100644 --- a/pkgs/by-name/ma/material-design-icons/package.nix +++ b/pkgs/by-name/ma/material-design-icons/package.nix @@ -3,12 +3,18 @@ fetchFromGitHub, stdenvNoCC, nix-update-script, + installFonts, }: stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; version = "7.4.47"; + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; @@ -17,17 +23,7 @@ stdenvNoCC.mkDerivation rec { sparseCheckout = [ "fonts" ]; }; - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/fonts/"{eot,truetype,woff,woff2} - cp fonts/*.eot "$out/share/fonts/eot/" - cp fonts/*.ttf "$out/share/fonts/truetype/" - cp fonts/*.woff "$out/share/fonts/woff/" - cp fonts/*.woff2 "$out/share/fonts/woff2/" - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; passthru.updateScript = nix-update-script { }; From d6e283635bd78248e69540932fe95b12cc7f80fb Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 28 May 2026 23:18:01 +0200 Subject: [PATCH 2/2] metarial-design-icons: use finalAttrs --- pkgs/by-name/ma/material-design-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/material-design-icons/package.nix b/pkgs/by-name/ma/material-design-icons/package.nix index 8a4d7b734137..d44886ff0b97 100644 --- a/pkgs/by-name/ma/material-design-icons/package.nix +++ b/pkgs/by-name/ma/material-design-icons/package.nix @@ -6,7 +6,7 @@ installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "material-design-icons"; version = "7.4.47"; @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7t3i3nPJZ/tRslLBfY+9kXH8TR145GC2hPFYJeMHRL8="; sparseCheckout = [ "fonts" ]; }; @@ -42,4 +42,4 @@ stdenvNoCC.mkDerivation rec { dixslyf ]; }; -} +})