diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2024-03-29 21:01:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 21:01:45 -0500 |
| commit | d5766175de1b5b0e09f7d25c0d552fe4ee617a91 (patch) | |
| tree | 354fb1e058495a6d6b73694254067e7615bda937 | |
| parent | cd75d22750541115d5e3876838645d2d9123c842 (diff) | |
| parent | 69d879dec3bdc4677701b2953ab3b70df6d69022 (diff) | |
Merge pull request #299366 from marsam/fix-pinentry_mac
pinentry_mac: fix mainProgram name
| -rw-r--r-- | pkgs/tools/security/pinentry/mac.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 4620aedecc75b..8e808e18edd32 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -5,6 +5,7 @@ , libassuan , libgpg-error , libiconv +, makeBinaryWrapper , texinfo , common-updater-scripts , writers @@ -37,14 +38,17 @@ stdenv.mkDerivation rec { (allow process-exec (literal "/usr/libexec/PlistBuddy")) ''; - nativeBuildInputs = [ autoreconfHook texinfo ]; + nativeBuildInputs = [ autoreconfHook makeBinaryWrapper texinfo ]; buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ]; installPhase = '' - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin mv macosx/pinentry-mac.app $out/Applications + + # Compatibility with `lib.getExe` + makeWrapper $out/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac $out/bin/pinentry-mac ''; enableParallelBuilding = true; @@ -85,6 +89,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://github.com/GPGTools/pinentry-mac"; platforms = lib.platforms.darwin; - mainProgram = passthru.binaryPath; + mainProgram = "pinentry-mac"; }; } |