pyrox.dev
Merge pull request #116242 from jtojnar/no-fish-args
buildFishPlugin: do not pass irrelevant arguments down
authored by Jan Tojnar and committed by GitHub d687129d 96cb2a4d
+9
-3
pkgs/shells/fish/plugins/build-fish-plugin.nix
+9
-3
pkgs/shells/fish/plugins/build-fish-plugin.nix
···
11
buildPhase ? ":",
12
preInstall ? "",
13
postInstall ? "",
14
-
# name of the subdirectory in which to store the plugin
15
-
installPath ? lib.getName pname,
16
17
checkInputs ? [],
18
# plugin packages to add to the vendor paths of the test fish shell
···
26
...
27
}:
28
29
-
stdenv.mkDerivation (attrs // {
30
inherit name;
31
inherit unpackPhase configurePhase buildPhase;
32
···
11
buildPhase ? ":",
12
preInstall ? "",
13
postInstall ? "",
14
15
checkInputs ? [],
16
# plugin packages to add to the vendor paths of the test fish shell
···
24
...
25
}:
26
27
+
let
28
+
# Do not pass attributes that are only relevant to buildFishPlugin to mkDerivation.
29
+
drvAttrs = builtins.removeAttrs attrs [
30
+
"checkPlugins"
31
+
"checkFunctionDirs"
32
+
];
33
+
in
34
+
35
+
stdenv.mkDerivation (drvAttrs // {
36
inherit name;
37
inherit unpackPhase configurePhase buildPhase;
38