diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-18 14:22:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-18 14:22:28 +0100 |
commit | d687129df556cd693cd6d67740133ed81c828a2e (patch) | |
tree | 7645f6bb23e5c2a74660d7de555d53186591e3af /pkgs/shells | |
parent | 96cb2a4d796c5c2003aa97e1cb95b2f50df6c3a7 (diff) | |
parent | f21526b5bbd38639483b386c2ed18771e91e026a (diff) |
Merge pull request #116242 from jtojnar/no-fish-args
buildFishPlugin: do not pass irrelevant arguments down
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/fish/plugins/build-fish-plugin.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix index a52c57464929..5bb4ffa243fc 100644 --- a/pkgs/shells/fish/plugins/build-fish-plugin.nix +++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix @@ -11,8 +11,6 @@ attrs@{ buildPhase ? ":", preInstall ? "", postInstall ? "", - # name of the subdirectory in which to store the plugin - installPath ? lib.getName pname, checkInputs ? [], # 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 unpackPhase configurePhase buildPhase; |