Fix prefetch-npm-deps override when functionArgs is not supported

This commit is contained in:
puck 2024-05-10 15:07:07 +00:00
parent 87b7b7e4bd
commit 7e8a5498db

View file

@ -45,6 +45,8 @@ let
}); });
inherit (prev) lib; inherit (prev) lib;
prefetch-npm-deps-args = lib.functionArgs prev.prefetch-npm-deps.override;
in in
override_2_18 // override_2_18 //
{ {
@ -74,7 +76,7 @@ override_2_18 //
# support both having and missing https://github.com/NixOS/nixpkgs/pull/304913 # support both having and missing https://github.com/NixOS/nixpkgs/pull/304913
prefetch-npm-deps = prefetch-npm-deps =
if (lib.functionArgs prev.prefetch-npm-deps.override) ? nix if (prefetch-npm-deps-args ? nix) || (prefetch-npm-deps-args == {})
then prev.prefetch-npm-deps.override { then prev.prefetch-npm-deps.override {
nix = final.nixVersions.nix_2_18_upstream; nix = final.nixVersions.nix_2_18_upstream;
} }