Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-03-30 06:00:57 +00:00 committed by GitHub
commit 459f861224
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions

View File

@ -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";
};
}