Skip to content

overrideSDK: fix on aarch64-darwin#340131

Merged
philiptaron merged 1 commit intoNixOS:masterfrom
emilazy:push-wqyrsqykoknm
Sep 6, 2024
Merged

overrideSDK: fix on aarch64-darwin#340131
philiptaron merged 1 commit intoNixOS:masterfrom
emilazy:push-wqyrsqykoknm

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Sep 6, 2024

Description of changes

I don’t want to talk about it.

Fixes QEMU.

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

I don’t want to talk about it.

Fixes QEMU.
@emilazy emilazy requested a review from philiptaron as a code owner September 6, 2024 16:00
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Sep 6, 2024
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 6, 2024
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

I'm going to take your word (and that of the Matrix channel) on this.

@philiptaron philiptaron merged commit d89b096 into NixOS:master Sep 6, 2024
@emilazy emilazy deleted the push-wqyrsqykoknm branch September 6, 2024 21:03
emilazy added a commit to emilazy/nixpkgs that referenced this pull request Sep 7, 2024
Thanks to <NixOS#340131>, this now
works, and we no longer need to vendor the patch.
@alyssais alyssais mentioned this pull request Sep 9, 2024
13 tasks
alyssais pushed a commit that referenced this pull request Sep 16, 2024
Thanks to <#340131>, this now
works, and we no longer need to vendor the patch.
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 6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any 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