gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iosevka: Allow privateBuildPlan to be a path

Browse Source
This commit is contained in:
Daniel Nagy
2022-08-03 16:36:36 +02:00
committed by Damien Cassou
parent 0e0cc47192
commit d51f8eeca9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/fonts/iosevka/default.nix
+9 -2
View File
@@ -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