iosevka: format with nixpkgs-fmt

This commit is contained in:
lunik1 2023-01-30 13:33:43 +00:00
parent d90de5e19b
commit 08d6f00328
No known key found for this signature in database
GPG Key ID: 6A37DF9483188492

View File

@ -48,7 +48,8 @@
# ''; # '';
, extraParameters ? null , extraParameters ? null
# Custom font set name. Required if any custom settings above. # Custom font set name. Required if any custom settings above.
, set ? null }: , set ? null
}:
assert (privateBuildPlan != null) -> set != null; assert (privateBuildPlan != null) -> set != null;
assert (extraParameters != null) -> set != null; assert (extraParameters != null) -> set != null;
@ -69,28 +70,31 @@ buildNpmPackage rec {
nativeBuildInputs = [ nodejs remarshal ttfautohint-nox ]; nativeBuildInputs = [ nodejs remarshal ttfautohint-nox ];
buildPlan = buildPlan =
if builtins.isAttrs privateBuildPlan if builtins.isAttrs privateBuildPlan then
then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }
else privateBuildPlan; else
privateBuildPlan;
inherit extraParameters; inherit extraParameters;
passAsFile = [ passAsFile = [ "extraParameters" ] ++ lib.optionals
"extraParameters" (
] ++ lib.optionals (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [ !(builtins.isString privateBuildPlan
"buildPlan" && lib.hasPrefix builtins.storeDir privateBuildPlan)
]; ) [ "buildPlan" ];
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
${lib.optionalString (builtins.isAttrs privateBuildPlan) '' ${lib.optionalString (builtins.isAttrs privateBuildPlan) ''
remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml
''} ''}
${lib.optionalString (builtins.isString privateBuildPlan && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' ${lib.optionalString (builtins.isString privateBuildPlan
cp "$buildPlanPath" private-build-plans.toml && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
''} cp "$buildPlanPath" private-build-plans.toml
${lib.optionalString (builtins.isString privateBuildPlan && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' ''}
cp "$buildPlan" private-build-plans.toml ${lib.optionalString (builtins.isString privateBuildPlan
''} && (lib.hasPrefix builtins.storeDir privateBuildPlan)) ''
cp "$buildPlan" private-build-plans.toml
''}
${lib.optionalString (extraParameters != null) '' ${lib.optionalString (extraParameters != null) ''
echo -e "\n" >> params/parameters.toml echo -e "\n" >> params/parameters.toml
cat "$extraParametersPath" >> params/parameters.toml cat "$extraParametersPath" >> params/parameters.toml