From d51f8eeca9fe666b0226bd6fdca0c8faadabaa67 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 15 Jul 2022 09:21:46 +0200 Subject: [PATCH] iosevka: Allow privateBuildPlan to be a path --- pkgs/data/fonts/iosevka/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index c145aad8d7d7..b4f64c59d80b 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -80,16 +80,23 @@ stdenv.mkDerivation rec { else privateBuildPlan; inherit extraParameters; - passAsFile = [ "buildPlan" "extraParameters" ]; + passAsFile = [ + "extraParameters" + ] ++ lib.optional (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [ + "buildPlan" + ]; configurePhase = '' runHook preConfigure ${lib.optionalString (builtins.isAttrs privateBuildPlan) '' remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml ''} - ${lib.optionalString (builtins.isString privateBuildPlan) '' + ${lib.optionalString (builtins.isString privateBuildPlan && (!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 (extraParameters != null) '' echo -e "\n" >> params/parameters.toml cat "$extraParametersPath" >> params/parameters.toml