From 7516cc722614d24890bada6d3ada1a30c86ecfd4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 10:10:25 +1000 Subject: [PATCH] openshift: use installShellFiles --- .../applications/networking/cluster/openshift/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index a9b0ed3fcb59..bcd259b138f7 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux -, coreutils, kerberos, clang +, coreutils, kerberos, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -35,7 +35,7 @@ in buildGoPackage rec { buildInputs = [ kerberos ]; - nativeBuildInputs = [ which rsync go-bindata clang ]; + nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; patchPhase = '' patchShebangs ./hack @@ -74,8 +74,8 @@ in buildGoPackage rec { installPhase = '' mkdir -p $bin/bin cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" - install -D -t "$bin/etc/bash_completion.d" contrib/completions/bash/* - install -D -t "$bin/share/zsh/site-functions" contrib/completions/zsh/* + installShellCompletion --bash contrib/completions/bash/* + installShellCompletion --zsh contrib/completions/zsh/* ''; meta = with stdenv.lib; {