about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-12-02 12:23:31 -0600
committerWill Dietz <w@wdtz.org>2018-12-02 12:23:31 -0600
commitd96a1bd9335daa10d91b771e42515e7678af865a (patch)
tree32ca2bdeed50439a85a2e96201dbd61744d5567c /pkgs/tools
parent02282130d095056e6f0096344144314651a917c0 (diff)
downloadnixlib-d96a1bd9335daa10d91b771e42515e7678af865a.tar
nixlib-d96a1bd9335daa10d91b771e42515e7678af865a.tar.gz
nixlib-d96a1bd9335daa10d91b771e42515e7678af865a.tar.bz2
nixlib-d96a1bd9335daa10d91b771e42515e7678af865a.tar.lz
nixlib-d96a1bd9335daa10d91b771e42515e7678af865a.tar.xz
nixlib-d96a1bd9335daa10d91b771e42515e7678af865a.tar.zst
nixlib-d96a1bd9335daa10d91b771e42515e7678af865a.zip
yubikey-manager: lazy-load completions, touchup library path generation
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/yubikey-manager/default.nix7
1 files 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