summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-03-13 21:26:33 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-03-13 21:30:37 +0100
commitf21526b5bbd38639483b386c2ed18771e91e026a (patch)
treed93536f030fbb4612ee6e881801ef002ed8f5a72 /pkgs/shells
parent5e367ecef917dadbe3e977b281a33c1fc9cf6e59 (diff)
downloadnixpkgs-f21526b5bbd38639483b386c2ed18771e91e026a.tar
nixpkgs-f21526b5bbd38639483b386c2ed18771e91e026a.tar.gz
nixpkgs-f21526b5bbd38639483b386c2ed18771e91e026a.tar.bz2
nixpkgs-f21526b5bbd38639483b386c2ed18771e91e026a.tar.lz
nixpkgs-f21526b5bbd38639483b386c2ed18771e91e026a.tar.xz
nixpkgs-f21526b5bbd38639483b386c2ed18771e91e026a.tar.zst
nixpkgs-f21526b5bbd38639483b386c2ed18771e91e026a.zip
buildFishPlugin: do not pass irrelevant arguments down
mkDerivation does not care about checkPlugins and checkFunctionDirs so let’s avoid polluting the scope.
Also remove installPath argument altogether for the same reason since it is not used at all.
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/fish/plugins/build-fish-plugin.nix12
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 a52c5746492..5bb4ffa243f 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;