Skip to content

pjsip: fix builds failing to patch executables on macos#416258

Merged
Aleksanaa merged 1 commit intoNixOS:masterfrom
sandydoo:fix-pjsip
Jun 16, 2025
Merged

pjsip: fix builds failing to patch executables on macos#416258
Aleksanaa merged 1 commit intoNixOS:masterfrom
sandydoo:fix-pjsip

Conversation

@sandydoo
Copy link
Contributor

@sandydoo sandydoo commented Jun 12, 2025

A lot of non-executable files in the build output are marked as executable, including a header file, which causes install_name_tool to fail.

We now search /bin and /share/**/samples specifically and check that the file is a Mach-O binary before patching.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

A lot of non-executable files in the build output are marked as
executable, including a header file, which causes `install_name_tool` to
fail.

We now search `/bin` and `/share/**/samples` specifically and check that
the file is a Mach-O binary before patching.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jun 12, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 12, 2025
@sandydoo
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 416258
Commit: 7872c3b8c68417ce9b11c891bd51f524845d940a


x86_64-darwin

✅ 3 packages built:
  • pjsip
  • pjsip.py (python312Packages.pjsua2, python312Packages.pjsua2.py)
  • python313Packages.pjsua2 (python313Packages.pjsua2.py)

aarch64-darwin

✅ 3 packages built:
  • pjsip
  • pjsip.py (python312Packages.pjsua2, python312Packages.pjsua2.py)
  • python313Packages.pjsua2 (python313Packages.pjsua2.py)

@Aleksanaa Aleksanaa merged commit 4de3a34 into NixOS:master Jun 16, 2025
19 of 20 checks passed
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: 1-10 This PR causes between 1 and 10 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