From d96a1bd9335daa10d91b771e42515e7678af865a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 2 Dec 2018 12:23:31 -0600 Subject: [PATCH] yubikey-manager: lazy-load completions, touchup library path generation --- pkgs/tools/misc/yubikey-manager/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 5b96b7c18fc1..e80eee2db3af 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -26,12 +26,13 @@ pythonPackages.buildPythonPackage rec { ]; makeWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${libu2f-host}/lib:${libusb1}/lib:${yubikey-personalization}/lib" + "--prefix" "LD_LIBRARY_PATH" ":" + (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ]) ]; postInstall = '' - mkdir -p $out/etc/bash_completion.d - _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true + mkdir -p $out/share/bash-completion/completions + _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || : ''; # See https://github.com/NixOS/nixpkgs/issues/29169