overlays/iosevka: refactor patcher argument passing, use bundled nerdicons

This commit is contained in:
Primrose 2026-01-03 11:10:27 +01:00
parent 4b66620329
commit d7e5df3f5d
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
2 changed files with 9 additions and 10 deletions

View file

@ -6,8 +6,7 @@
}: }:
{ {
font, font,
extraArgs ? [ ], patcherArgs ? [ ],
useDefaultsArgs ? true,
}: }:
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
/* /*
@ -27,17 +26,15 @@ stdenvNoCC.mkDerivation {
buildPhase = buildPhase =
let let
args = allPatcherArgs = [
lib.optionals useDefaultsArgs [
"--complete"
"--no-progressbars" "--no-progressbars"
] ]
++ extraArgs; ++ patcherArgs;
in in
'' ''
mkdir -p nerd-font mkdir -p nerd-font
find \( -name \*.ttf -o -name \*.otf \) | parallel --jobs=$NIX_BUILD_CORES nerd-font-patcher {} \ find \( -name \*.ttf -o -name \*.otf \) | parallel --jobs=$NIX_BUILD_CORES nerd-font-patcher {} \
--outputdir nerd-font ${builtins.concatStringsSep " " args} --outputdir nerd-font ${builtins.concatStringsSep " " allPatcherArgs}
''; '';
installPhase = '' installPhase = ''

View file

@ -7,7 +7,9 @@ final: prev: rec {
// { // {
iosevka = mkNerdFont { iosevka = mkNerdFont {
font = iosevka; font = iosevka;
extraArgs = [ patcherArgs = [
"--complete"
"--careful"
"--name {/.}-NFM" "--name {/.}-NFM"
"--mono" "--mono"
]; ];