diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-23 06:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-23 06:00:57 +0000 |
| commit | f95580a6ffc99b346f2f535921124414a97d0f2a (patch) | |
| tree | b96372e5593bcf3b208a566dec71004201f6d374 /nixos | |
| parent | 334a61dd1d98966f0ddc026f20e144e6bd78432f (diff) | |
| parent | 0b0169e4f12a5c27d4835da8644265535a91c878 (diff) | |
| download | nixlib-f95580a6ffc99b346f2f535921124414a97d0f2a.tar nixlib-f95580a6ffc99b346f2f535921124414a97d0f2a.tar.gz nixlib-f95580a6ffc99b346f2f535921124414a97d0f2a.tar.bz2 nixlib-f95580a6ffc99b346f2f535921124414a97d0f2a.tar.lz nixlib-f95580a6ffc99b346f2f535921124414a97d0f2a.tar.xz nixlib-f95580a6ffc99b346f2f535921124414a97d0f2a.tar.zst nixlib-f95580a6ffc99b346f2f535921124414a97d0f2a.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -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 c85097f45e92..b500b8f24b2c 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 |