From 16df60734a76eedbe3f265ee492587f1f42c4796 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:52 +1000 Subject: [PATCH] kops: use installShellFiles --- .../applications/networking/cluster/kops/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a5f1806e577..4d2e406c040 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: let goPackagePath = "k8s.io/kops"; @@ -18,7 +18,7 @@ let inherit sha256; }; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; subPackages = [ "cmd/kops" ]; buildFlagsArray = '' @@ -33,10 +33,10 @@ let ''; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - mkdir -p $bin/share/zsh/site-functions - $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops - $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops + for shell in bash zsh; do + $bin/bin/kops completion $shell > kops.$shell + installShellCompletion kops.$shell + done ''; meta = with stdenv.lib; {