Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "darwin.apple_sdk.frameworks.IOSurface: use Libsystem instead of xpc (#161561)" #162681

Merged
merged 1 commit into from
Mar 5, 2022

Conversation

malob
Copy link
Member

@malob malob commented Mar 3, 2022

Motivation for this change

See comment here: #161561 (comment)

This reverts commit 92074a4.

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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@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 Mar 3, 2022
@malob
Copy link
Member Author

malob commented Mar 3, 2022

cc @veprbl

@veprbl veprbl requested review from kloenk and toonn March 4, 2022 00:29
Copy link
Contributor

@toonn toonn 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 OK with the revert since it's necessary. It's a bit of a step back though. Would leaving a comment that it should probably depend on Libsystem instead as soon as the libcxx situation is sorted help us remember to fix this up?

@malob
Copy link
Member Author

malob commented Mar 4, 2022

@toonn, added a comment as you suggested.

Maybe the Darwin project should be updated and issues related to stuff like this should be added?

@veprbl veprbl merged commit 62860b3 into NixOS:staging Mar 5, 2022
@toonn
Copy link
Contributor

toonn commented Mar 5, 2022

I agree, adding an issue describing the problem and linking here and to the original PR and then adding it to the project board would be good. I'm not sure who has access to that board though? (The LLVM 9 update can be removed for example, we skipped 9 and went to 11.)

@toonn
Copy link
Contributor

toonn commented Mar 6, 2022

I opened #163052 so we have something to add to the Darwin project board. Any further information is welcome. Is this problem due to our Libsystem being as old as it is?

@malob malob deleted the revert-161561 branch March 7, 2022 19:13
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: 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.

3 participants