Merge pull request #116242 from jtojnar/no-fish-args

buildFishPlugin: do not pass irrelevant arguments down
This commit is contained in:
Jan Tojnar
2021-03-18 14:22:28 +01:00
committed by GitHub
@@ -11,8 +11,6 @@ attrs@{
buildPhase ? ":", buildPhase ? ":",
preInstall ? "", preInstall ? "",
postInstall ? "", postInstall ? "",
# name of the subdirectory in which to store the plugin
installPath ? lib.getName pname,
checkInputs ? [], checkInputs ? [],
# plugin packages to add to the vendor paths of the test fish shell # plugin packages to add to the vendor paths of the test fish shell
@@ -26,7 +24,15 @@ attrs@{
... ...
}: }:
stdenv.mkDerivation (attrs // { let
# Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation.
drvAttrs = builtins.removeAttrs attrs [
"checkPlugins"
"checkFunctionDirs"
];
in
stdenv.mkDerivation (drvAttrs // {
inherit name; inherit name;
inherit unpackPhase configurePhase buildPhase; inherit unpackPhase configurePhase buildPhase;