From 6dd6c2b7b30a112592f194e6ed0e6a3669215132 Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng Date: Fri, 20 Jan 2023 13:24:01 +0800 Subject: [PATCH 1/3] material-design-icons: convert to `stdenvNoCC.mkDerivation` --- .../fonts/material-design-icons/default.nix | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 82f422146ac7..43a5a890fd02 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -1,24 +1,30 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchFromGitHub, stdenvNoCC }: -let +stdenvNoCC.mkDerivation rec { + pname = "material-design-icons"; version = "7.0.96"; -in fetchFromGitHub { - name = "material-design-icons-${version}"; - owner = "Templarian"; - repo = "MaterialDesign-Webfont"; - rev = "v${version}"; - postFetch = '' - mkdir -p $out/share/fonts/{eot,truetype,woff,woff2} - mv $out/fonts/*.eot $out/share/fonts/eot/ - mv $out/fonts/*.ttf $out/share/fonts/truetype/ - mv $out/fonts/*.woff $out/share/fonts/woff/ - mv $out/fonts/*.woff2 $out/share/fonts/woff2/ - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + dontBuild = true; + + src = fetchFromGitHub { + owner = "Templarian"; + repo = "MaterialDesign-Webfont"; + rev = "v${version}"; + sha256 = "sha256-d4weq1V8Pk0xJxzTVaiyMhkMHvrH3SBkUzRQT3w7n0U="; + 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 ''; - sha256 = "sha256-l60LRXLwLh+7Ls3kMTJ5eDTVpVMcqtshMv/ehIk8fCk="; meta = with lib; { description = "7000+ Material Design Icons from the Community"; From a5bcee65171cf1f9b77ab9857cb6c14cdf98cc9a Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng Date: Fri, 20 Jan 2023 13:35:16 +0800 Subject: [PATCH 2/3] material-design-icons: 7.0.96 -> 7.1.96 --- pkgs/data/fonts/material-design-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 43a5a890fd02..c5b8ba00e95d 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; - version = "7.0.96"; + version = "7.1.96"; dontBuild = true; @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { owner = "Templarian"; repo = "MaterialDesign-Webfont"; rev = "v${version}"; - sha256 = "sha256-d4weq1V8Pk0xJxzTVaiyMhkMHvrH3SBkUzRQT3w7n0U="; + sha256 = "sha256-qS7zJQkd0Q5wYLgYXa63fD3Qi2T5JWD6vXW2FoFzZxo="; sparseCheckout = [ "fonts" ]; }; From aedca364f913021a0b84ab678754adcd6ee495c8 Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng Date: Fri, 20 Jan 2023 13:36:18 +0800 Subject: [PATCH 3/3] material-design-icons: add PlayerNameHere as maintainer --- pkgs/data/fonts/material-design-icons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index c5b8ba00e95d..fdd85f66e408 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -36,6 +36,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://materialdesignicons.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ vlaci ]; + maintainers = with maintainers; [ vlaci PlayerNameHere ]; }; }