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

CoreFoundation: apply hook to correct platform #284706

Merged
merged 1 commit into from
Feb 8, 2024

Conversation

szlend
Copy link
Member

@szlend szlend commented Jan 29, 2024

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.11 without getting rid of the hook in case anyone was relying on it.

In unstable we probably want to get rid of the hook entirely. See #284629.

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.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@szlend
Copy link
Member Author

szlend commented Jan 29, 2024

Some checks failed because of API rate-limiting. I don't think I have permissions to rerun them.

Edit: I'll just rebase.

@szlend
Copy link
Member Author

szlend commented Jan 29, 2024

Fixed cross-compiling aws-sdk-cpp:

$ nix build -f . pkgsCross.muslpi.aws-sdk-cpp --sandbox -L --print-out-paths
/nix/store/66a4f2bshzysarkf1kdlskbzw0qwn6g5-aws-sdk-cpp-armv6l-unknown-linux-musleabihf-1.11.118

Copy link
Contributor

@reckenrode reckenrode left a comment

Choose a reason for hiding this comment

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

LGTM

@toonn Pinging you for your review.

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.

Couple questions that apply to the hook changes, only commented on one of them because the changes are identical AFAICT.

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.

LGTM

@vcunat vcunat merged commit 747d058 into NixOS:staging-23.11 Feb 8, 2024
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants