From b49b6daedf6e41ea28b0e04c1dad32e8a71d81d7 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 15 Jul 2022 21:40:13 +0200 Subject: [PATCH] iosevka-comfy: Simplify calling of package --- pkgs/data/fonts/iosevka/comfy.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index 56b6f26bc18f..bdd6e1986b32 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/pkgs/data/fonts/iosevka/comfy.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, nodejs, nodePackages, remarshal, ttfautohint-nox, fetchurl -, fetchFromGitHub }: +{ callPackage, lib, fetchFromGitHub }: let sets = [ "comfy" "comfy-fixed" "comfy-duo" "comfy-wide" "comfy-wide-fixed" ]; @@ -26,8 +25,8 @@ let maintainers = [ maintainers.DamienCassou ]; }; }); - makeIosevkaFont = set: (import ./default.nix { - inherit stdenv lib nodejs nodePackages remarshal ttfautohint-nox set privateBuildPlan; + makeIosevkaFont = set: (callPackage ./. { + inherit set privateBuildPlan; }).overrideAttrs overrideAttrs; in builtins.listToAttrs (builtins.map (set: {name=set; value=makeIosevkaFont set;}) sets)