From 586a0dbd76daf77646d4638ae04fc25c437c7f99 Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Thu, 20 Mar 2025 00:00:00 +0700 Subject: [PATCH] keepassxc: symlink CLI programs to bin output on Darwin Fixes https://github.com/NixOS/nixpkgs/issues/359061. --- pkgs/applications/misc/keepassxc/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 4e0a53397944..42d69a6f863c 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -110,11 +110,20 @@ stdenv.mkDerivation rec { wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" ''; - # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317 - postInstall = lib.optionalString withKeePassBrowser '' - mkdir -p "$out/lib/mozilla/native-messaging-hosts" - substituteAll "${./firefox-native-messaging-host.json}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json" - ''; + postInstall = lib.concatLines [ + (lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/bin" + for program in keepassxc-cli keepassxc-proxy; do + ln -s "$out/Applications/KeePassXC.app/Contents/MacOS/$program" "$out/bin/$program" + done + '') + + # See https://github.com/keepassxreboot/keepassxc/blob/cd7a53abbbb81e468efb33eb56eefc12739969b8/src/browser/NativeMessageInstaller.cpp#L317 + (lib.optionalString withKeePassBrowser '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + substituteAll "${./firefox-native-messaging-host.json}" "$out/lib/mozilla/native-messaging-hosts/org.keepassxc.keepassxc_browser.json" + '') + ]; buildInputs = [