Skip to content

Comments

pinentry-mac: fix build with Darwin sandbox enabled#234111

Merged
wegank merged 1 commit intoNixOS:masterfrom
reckenrode:pinentry-mac-darwin-sandbox
May 27, 2023
Merged

pinentry-mac: fix build with Darwin sandbox enabled#234111
wegank merged 1 commit intoNixOS:masterfrom
reckenrode:pinentry-mac-darwin-sandbox

Conversation

@reckenrode
Copy link
Contributor

@reckenrode reckenrode commented May 26, 2023

Description of changes

pinentry-mac needs PlistBuddy to build and hardcodes the system one at /usr/libexec/PlistBuddy. I tried to replace it with the one from xcbuild, but that version didn’t like the arguments the pinentry-mac build process was trying to pass to it.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 26, 2023
@reckenrode reckenrode force-pushed the pinentry-mac-darwin-sandbox branch from c0d6e66 to 7ca376e Compare May 26, 2023 16:41
@reckenrode reckenrode force-pushed the pinentry-mac-darwin-sandbox branch from 7ca376e to 8f84341 Compare May 26, 2023 16:43
@wegank
Copy link
Member

wegank commented May 27, 2023

@ofborg build pinentry_mac gnupg22 gnupg

@wegank wegank merged commit 9fdb5f9 into NixOS:master May 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants