colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #299366 from marsam/fix-pinentry_mac

Browse Source 
pinentry_mac: fix mainProgram name
This commit is contained in:
Mario Rodas 2024-03-29 21:01:45 -05:00 committed by GitHub
commit d5766175de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/security/pinentry/mac.nix
View File

@ -5,6 +5,7 @@
, libassuan , libassuan
, libgpg-error , libgpg-error
, libiconv , libiconv
, makeBinaryWrapper
, texinfo , texinfo
, common-updater-scripts , common-updater-scripts
, writers , writers
@ -37,14 +38,17 @@ stdenv.mkDerivation rec {
(allow process-exec (literal "/usr/libexec/PlistBuddy")) (allow process-exec (literal "/usr/libexec/PlistBuddy"))
''; '';
nativeBuildInputs = [ autoreconfHook texinfo ]; nativeBuildInputs = [ autoreconfHook makeBinaryWrapper texinfo ];
buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; buildInputs = [ libassuan libgpg-error libiconv Cocoa ];
configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ]; configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ];
installPhase = '' installPhase = ''
mkdir -p $out/Applications mkdir -p $out/Applications $out/bin
mv macosx/pinentry-mac.app $out/Applications 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; enableParallelBuilding = true;
@ -85,6 +89,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
homepage = "https://github.com/GPGTools/pinentry-mac"; homepage = "https://github.com/GPGTools/pinentry-mac";
platforms = lib.platforms.darwin; platforms = lib.platforms.darwin;
mainProgram = passthru.binaryPath; mainProgram = "pinentry-mac";
}; };
} }