From 955bc676eb3557429ab4c4e67091b439d012cd4c Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 1 Feb 2024 14:22:23 +0800 Subject: [PATCH 1/4] material-icons: 3.0.1 -> 4.0.0 --- pkgs/data/fonts/material-icons/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index f03e8683e509..f8dcde02ed2e 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -2,20 +2,23 @@ stdenvNoCC.mkDerivation rec { pname = "material-icons"; - version = "3.0.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "google"; repo = "material-design-icons"; rev = version; - hash = "sha256-4FphNJCsaLWzlVR4TmXnDBid0EVj39fkeoh5j1leBZ8="; + hash = "sha256-wX7UejIYUxXOnrH2WZYku9ljv4ZAlvgk8EEJJHOCCjE="; }; installPhase = '' runHook preInstall mkdir -p $out/share/fonts/truetype - cp iconfont/*.ttf $out/share/fonts/truetype + cp font/*.ttf $out/share/fonts/truetype + + mkdir -p $out/share/fonts/opentype + cp font/*.otf $out/share/fonts/opentype runHook postInstall ''; From e36c7a9a989b2f32316aef20dd1a5b8dd01e9aa6 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 1 Feb 2024 14:23:15 +0800 Subject: [PATCH 2/4] material-icons: skip unwanted phases --- pkgs/data/fonts/material-icons/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index f8dcde02ed2e..bc5ce3c82ff3 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -11,6 +11,9 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-wX7UejIYUxXOnrH2WZYku9ljv4ZAlvgk8EEJJHOCCjE="; }; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall From 3a440b118627d5047b541c7ae8c3c0d3a5efd59a Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 1 Feb 2024 14:23:37 +0800 Subject: [PATCH 3/4] material-icons: rec -> finalAttrs --- pkgs/data/fonts/material-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index bc5ce3c82ff3..0b29cd340a28 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -1,6 +1,6 @@ { lib, stdenvNoCC, fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "material-icons"; version = "4.0.0"; @@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ mpcsh ]; }; -} +}) From 009036e6ebf29d9591a34c22797ca4da1f69b2c9 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 1 Feb 2024 14:25:10 +0800 Subject: [PATCH 4/4] material-icons: add update script --- pkgs/data/fonts/material-icons/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index 0b29cd340a28..993e25ba2cd3 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub, nix-update-script }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "material-icons"; @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "google"; repo = "material-design-icons"; - rev = version; + rev = finalAttrs.version; hash = "sha256-wX7UejIYUxXOnrH2WZYku9ljv4ZAlvgk8EEJJHOCCjE="; }; @@ -26,6 +26,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "System status icons by Google, featuring material design"; homepage = "https://material.io/icons";