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

Merge pull request #114893 from bobrik/ivan/pinentry-mac-aarch64 

pinentry_mac: make it compile on arm64
This commit is contained in:
Sandro 2021-03-06 05:39:38 +01:00 committed by GitHub
parent f8441c6b89 4aff0e523a
commit 71fa142f9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,12 @@ stdenv.mkDerivation {
nativeBuildInputs = [ xcbuildHook ]; nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ libiconv ncurses Cocoa ]; buildInputs = [ libiconv ncurses Cocoa ];
preBuild = ''
# Only build for what we care about (also allows arm64)
substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \
--replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}"
'';
installPhase = '' installPhase = ''
mkdir -p $out/Applications mkdir -p $out/Applications
mv Products/Release/pinentry-mac.app $out/Applications mv Products/Release/pinentry-mac.app $out/Applications

2
pkgs/top-level/all-packages.nix
View File

@ -7171,7 +7171,7 @@ in
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
xcbuildHook = xcbuild6Hook; xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook;
}; };
pingtcp = callPackage ../tools/networking/pingtcp { }; pingtcp = callPackage ../tools/networking/pingtcp { };