diff options
| author | Ivan Babrou <github@ivan.computer> | 2021-02-24 23:00:09 -0800 |
|---|---|---|
| committer | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-03 19:23:49 +0000 |
| commit | 4aff0e523a409f51f61de96627b04ff294a5aeb5 (patch) | |
| tree | 26e92b397b2c4c5b7774244ba0c31a2a280d37ce /pkgs | |
| parent | 394bc6c138bc8248f65360ac7d185fae5c6409d9 (diff) | |
pinentry_mac: make it compile on arm64
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/pinentry/mac.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 9c328d472c4bd..27917ffbbf174 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ xcbuildHook ]; 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 = '' mkdir -p $out/Applications mv Products/Release/pinentry-mac.app $out/Applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36e77b1bc5f7c..719649455e875 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7142,7 +7142,7 @@ in pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - xcbuildHook = xcbuild6Hook; + xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook; }; pingtcp = callPackage ../tools/networking/pingtcp { }; |