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

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

Browse Source 
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
commit d687129df5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;