CoreFoundation: apply hook to correct platform#284706
Merged
vcunat merged 1 commit intoNixOS:staging-23.11from Feb 8, 2024
Merged
CoreFoundation: apply hook to correct platform#284706vcunat merged 1 commit intoNixOS:staging-23.11from
vcunat merged 1 commit intoNixOS:staging-23.11from
Conversation
This was referenced Jan 29, 2024
Member
Author
|
Some checks failed because of API rate-limiting. I don't think I have permissions to rerun them. Edit: I'll just rebase. |
ofborg
bot
added
the
10.rebuild-darwin-stdenv
ofborg
bot
added
10.rebuild-darwin: 501+
szlend
force-pushed
the
core-foundation-hook-role
branch
from
8862d89 to
1d8c2f1
Compare
Member
Author
|
Fixed cross-compiling |
reckenrode
approved these changes
Feb 3, 2024
Contributor
reckenrode
left a comment
reckenrode
left a comment
There was a problem hiding this comment.
LGTM
@toonn Pinging you for your review.
delroth
added
the
12.approvals: 1
toonn
reviewed
Feb 6, 2024
Contributor
toonn
left a comment
toonn
left a comment
There was a problem hiding this comment.
Couple questions that apply to the hook changes, only commented on one of them because the changes are identical AFAICT.
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Cross-compiling from darwin to linux is broken if the derivation includes CoreFoundation somewhere in its (native) input deps. This change makes the cf-setup-hook aware of its platform role, replacing NIX_LDFLAGS with NIX_LDFLAGS_FOR_BUILD when necessary.
Fixes #278348 in
23.11without getting rid of the hook in case anyone was relying on it.In
unstablewe probably want to get rid of the hook entirely. See #284629.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.