diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-23 06:28:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-23 06:28:23 +0300 |
| commit | 87ee3c4fdf7e9a14cc4207a3369f822c1dce560a (patch) | |
| tree | 37a30201fbded9ab376ca72668ea69d77c61bf6f /nixos/modules/programs | |
| parent | 2b6c2125594be41fec07ee7030d9898eccd35742 (diff) | |
| parent | 3fd98e7fcb2fdc1b7699fd7de2bc83c67cf21c4a (diff) | |
| download | nixpkgs-87ee3c4fdf7e9a14cc4207a3369f822c1dce560a.tar nixpkgs-87ee3c4fdf7e9a14cc4207a3369f822c1dce560a.tar.gz nixpkgs-87ee3c4fdf7e9a14cc4207a3369f822c1dce560a.tar.bz2 nixpkgs-87ee3c4fdf7e9a14cc4207a3369f822c1dce560a.tar.lz nixpkgs-87ee3c4fdf7e9a14cc4207a3369f822c1dce560a.tar.xz nixpkgs-87ee3c4fdf7e9a14cc4207a3369f822c1dce560a.tar.zst nixpkgs-87ee3c4fdf7e9a14cc4207a3369f822c1dce560a.zip | |
Merge pull request #176886 from hyperfekt/nonderivation_fish-completion
Diffstat (limited to 'nixos/modules/programs')
| -rw-r--r-- | nixos/modules/programs/fish.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index c85097f45e9..b500b8f24b2 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -258,16 +258,13 @@ in preferLocalBuild = true; allowSubstitutes = false; }; - generateCompletions = package: pkgs.runCommand - "${package.name}_fish-completions" - ( - { - inherit package; - preferLocalBuild = true; - allowSubstitutes = false; - } - // optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; } - ) + generateCompletions = package: pkgs.runCommandLocal + ( with lib.strings; let + storeLength = stringLength storeDir + 34; # Nix' StorePath::HashLen + 2 for the separating slash and dash + pathName = substring storeLength (stringLength package - storeLength) package; + in (package.name or pathName) + "_fish-completions") + ( { inherit package; } // + optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }) '' mkdir -p $out if [ -d $package/share/man ]; then |