From 889fd0ca40b06cc040b3640a70de8a3c977587f9 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Tue, 29 Mar 2022 16:31:17 -0700 Subject: [PATCH] _1password: fixup packaging installPhase was missing a preInstall hook, and concatMapStrings is too fancy for such a small thing. --- pkgs/applications/misc/1password/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 25685b2e125e..9d7a4fcd94ca 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -42,12 +42,17 @@ stdenv.mkDerivation { ''; installPhase = '' + runHook preInstall install -D ${mainProgram} $out/bin/${mainProgram} runHook postInstall ''; - postInstall = "installShellCompletion --cmd ${mainProgram}" + lib.concatMapStrings - (s: " --${s} <($out/bin/${mainProgram} completion ${s})") [ "bash" "fish" "zsh" ]; + postInstall = '' + installShellCompletion --cmd ${mainProgram} \ + --bash <($out/bin/${mainProgram} completion bash) \ + --fish <($out/bin/${mainProgram} completion fish) \ + --zsh <($out/bin/${mainProgram} completion zsh) + ''; dontStrip = stdenv.isDarwin;