about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2020-05-31 16:04:05 +0200
committerGitHub <noreply@github.com>2020-05-31 16:04:05 +0200
commit21680361ef8a296407c8ab1c2667dcc263462639 (patch)
tree8e0862a99fe1ae16f793d938b6b7c68aa6245a7a
parent1957a620398f8be3b0fc0a8bd3e849edb0d38695 (diff)
parentf7056dca7433cbb0fd1f662b27d354c727af6473 (diff)
downloadnixlib-21680361ef8a296407c8ab1c2667dcc263462639.tar
nixlib-21680361ef8a296407c8ab1c2667dcc263462639.tar.gz
nixlib-21680361ef8a296407c8ab1c2667dcc263462639.tar.bz2
nixlib-21680361ef8a296407c8ab1c2667dcc263462639.tar.lz
nixlib-21680361ef8a296407c8ab1c2667dcc263462639.tar.xz
nixlib-21680361ef8a296407c8ab1c2667dcc263462639.tar.zst
nixlib-21680361ef8a296407c8ab1c2667dcc263462639.zip
Merge pull request #89250 from mayflower/docker-compose-fix-zsh-completion
docker-compose: fix zsh completion
-rw-r--r--pkgs/applications/virtualization/docker-compose/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index 14c5ec0a4161..71359467c5c6 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -1,4 +1,5 @@
 { stdenv, buildPythonApplication, fetchPypi, pythonOlder
+, installShellFiles
 , mock, pytest, nose
 , pyyaml, backports_ssl_match_hostname, colorama, docopt
 , dockerpty, docker, ipaddress, jsonschema, requests
@@ -17,6 +18,7 @@ buildPythonApplication rec {
 
   # lots of networking and other fails
   doCheck = false;
+  nativeBuildInputs = [ installShellFiles ];
   checkInputs = [ mock pytest nose ];
   propagatedBuildInputs = [
     pyyaml backports_ssl_match_hostname colorama dockerpty docker
@@ -33,11 +35,8 @@ buildPythonApplication rec {
   '';
 
   postInstall = ''
-    install -D -m 0444 contrib/completion/bash/docker-compose \
-      $out/share/bash-completion/completions/docker-compose
-
-    install -D -m 0444 contrib/completion/zsh/_docker-compose \
-      $out/share/zsh-completion/zsh/site-functions/_docker-compose
+    installShellCompletion --bash contrib/completion/bash/docker-compose
+    installShellCompletion --zsh contrib/completion/zsh/_docker-compose
   '';
 
   meta = with stdenv.lib; {