JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

buildFishPlugin: do not pass irrelevant arguments down

Browse Source 
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.
This commit is contained in:
Jan Tojnar 2021-03-13 21:26:33 +01:00
parent 5e367ecef9
commit f21526b5bb
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/shells/fish/plugins/build-fish-plugin.nix
View File

@ -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;