diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 8dbfc26dab38..68a6b989913a 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -17,15 +17,17 @@ weights, and freely available to all. '', }: - -stdenvNoCC.mkDerivation rec { +let + _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; +in +stdenvNoCC.mkDerivation (finalAttrs: { pname = "noto-fonts${suffix}"; version = "2026.02.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; - rev = "noto-monthly-release-${version}"; + tag = "noto-monthly-release-${finalAttrs.version}"; hash = "sha256-vhu3jojG6QlgY5gP4bCbpJznsQ1gExAfcRT42FcZUp4="; }; @@ -34,8 +36,6 @@ stdenvNoCC.mkDerivation rec { "megamerge" # Experimental fonts created by merging regular notofonts ]; - _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; - installPhase = '' # We check availability in order of variable -> otf -> ttf # unhinted -- the hinted versions use autohint @@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec { '' else '' - for variant in $_variants; do + for variant in ${lib.concatStringsSep " " _variants}; do if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf elif [[ -d fonts/"$variant"/unhinted/otf ]]; then @@ -91,4 +91,4 @@ stdenvNoCC.mkDerivation rec { jopejoe1 ]; }; -} +})