diff options
| author | Daniel Nagy <danielnagy@posteo.de> | 2022-07-15 09:21:46 +0200 |
|---|---|---|
| committer | Damien Cassou <damien@cassou.me> | 2022-08-03 16:36:36 +0200 |
| commit | d51f8eeca9fe666b0226bd6fdca0c8faadabaa67 (patch) | |
| tree | 59a70f9f444eeb0ee0a125e8d94654041c87b105 /pkgs/data/fonts/iosevka | |
| parent | 0e0cc471928c9f20253b5c02ccab0829315e66b1 (diff) | |
| download | nixpkgs-d51f8eeca9fe666b0226bd6fdca0c8faadabaa67.tar nixpkgs-d51f8eeca9fe666b0226bd6fdca0c8faadabaa67.tar.gz nixpkgs-d51f8eeca9fe666b0226bd6fdca0c8faadabaa67.tar.bz2 nixpkgs-d51f8eeca9fe666b0226bd6fdca0c8faadabaa67.tar.lz nixpkgs-d51f8eeca9fe666b0226bd6fdca0c8faadabaa67.tar.xz nixpkgs-d51f8eeca9fe666b0226bd6fdca0c8faadabaa67.tar.zst nixpkgs-d51f8eeca9fe666b0226bd6fdca0c8faadabaa67.zip | |
iosevka: Allow privateBuildPlan to be a path
Diffstat (limited to 'pkgs/data/fonts/iosevka')
| -rw-r--r-- | pkgs/data/fonts/iosevka/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index c145aad8d7d..b4f64c59d80 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 |