Skip to content

qt6.qtdeclarative: fix code-signing on Darwin#398849

Merged
thiagokokada merged 1 commit intoNixOS:masterfrom
reckenrode:push-romwyzlrzzsp
Apr 18, 2025
Merged

qt6.qtdeclarative: fix code-signing on Darwin#398849
thiagokokada merged 1 commit intoNixOS:masterfrom
reckenrode:push-romwyzlrzzsp

Conversation

@reckenrode
Copy link
Contributor

The build tries to sign qmltestrunner, but sometimes it’s already signed, causing the signing to fail due to an existing signature. Cherry-pick this patch from upstream to force sign it regardless.

I made this conditional on Darwin to target master without causing rebuilds on Linux.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 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 Apr 15, 2025
@nix-owners nix-owners bot requested a review from outfoxxed April 15, 2025 12:30
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should make this none linux conditional and eat the rebuilds in my opinion to notice when it no longer applies as I think all maintainers are not that deep into darwin.

Also nixfmt is unhappy.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the formatting. @K900, are you fine with eating the rebuilds? I can drop the conditional if so.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can just merge this, then drop the conditional next cycle.

The build tries to sign qmltestrunner, but sometimes it’s already
signed, causing the signing to fail due to an existing signature.
Cherry-pick this patch from upstream to force sign it regardless.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 17, 2025
@thiagokokada thiagokokada merged commit d304d55 into NixOS:master Apr 18, 2025
27 of 28 checks passed
@reckenrode reckenrode deleted the push-romwyzlrzzsp branch April 18, 2025 11:09
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/macos-nixpkgs-24-11-qtdeclarative-6-8-3-result-in-bin-sh-codesign-command-not-found/63487/6

@vcunat
Copy link
Member

vcunat commented Apr 26, 2025

Any idea why this fix doesn't seem to work on 24.11?
https://hydra.nixos.org/build/295884712
https://hydra.nixos.org/build/295885088

@reckenrode
Copy link
Contributor Author

Hydra for 24.11 is failing because it can’t find codesign. It also needs 5ee4400.

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.

6 participants