Skip to content

CoreFoundation: apply hook to correct platform#284288

Closed
szlend wants to merge 10000 commits intoNixOS:staging-23.11from
szlend:core-foundation-hook-cross
Closed

CoreFoundation: apply hook to correct platform#284288
szlend wants to merge 10000 commits intoNixOS:staging-23.11from
szlend:core-foundation-hook-cross

Conversation

@szlend
Copy link
Copy Markdown
Member

@szlend szlend commented Jan 27, 2024 •
edited
Loading

Description of changes

I'm closing this PR because changing the branch base (before updating the branch) assigned a million reviewers. Apologies for that. I opened a new PR #284706.

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

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.

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@copumpkin copumpkin Awaiting requested review from copumpkin

@thefloweringash thefloweringash Awaiting requested review from thefloweringash

@stephank stephank Awaiting requested review from stephank

@reckenrode reckenrode Awaiting requested review from reckenrode

@r-burns r-burns Awaiting requested review from r-burns

@wegank wegank Awaiting requested review from wegank

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius RaitoBezarius is a code owner

@lilyinstarlight lilyinstarlight Awaiting requested review from lilyinstarlight

@winterqt winterqt Awaiting requested review from winterqt winterqt is a code owner

@IvarWithoutBones IvarWithoutBones Awaiting requested review from IvarWithoutBones

@bendlas bendlas Awaiting requested review from bendlas bendlas is a code owner

@emilylange emilylange Awaiting requested review from emilylange emilylange is a code owner

@piegamesde piegamesde Awaiting requested review from piegamesde piegamesde is a code owner

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

@kalbasit kalbasit Awaiting requested review from kalbasit kalbasit is a code owner

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@mmahut mmahut Awaiting requested review from mmahut

@RaghavSood RaghavSood Awaiting requested review from RaghavSood RaghavSood is a code owner

@roberth roberth Awaiting requested review from roberth roberth is a code owner

@adisbladis adisbladis Awaiting requested review from adisbladis adisbladis is a code owner

@jonringer jonringer Awaiting requested review from jonringer

@figsoda figsoda Awaiting requested review from figsoda

@teto teto Awaiting requested review from teto teto is a code owner

@peti peti Awaiting requested review from peti peti is a code owner

@mweinelt mweinelt Awaiting requested review from mweinelt mweinelt is a code owner

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice thoughtpolice is a code owner

@joachifm joachifm Awaiting requested review from joachifm

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

@alyssais alyssais Awaiting requested review from alyssais alyssais is a code owner

@edwtjo edwtjo Awaiting requested review from edwtjo edwtjo is a code owner

@cdepillabout cdepillabout Awaiting requested review from cdepillabout cdepillabout is a code owner

@sternenseemann sternenseemann Awaiting requested review from sternenseemann sternenseemann is a code owner

@maralorn maralorn Awaiting requested review from maralorn maralorn is a code owner

@ncfavier ncfavier Awaiting requested review from ncfavier ncfavier is a code owner

@FRidh FRidh Awaiting requested review from FRidh

@samueldr samueldr Awaiting requested review from samueldr

@tfc tfc Awaiting requested review from tfc tfc is a code owner

@grahamc grahamc Awaiting requested review from grahamc

@cole-h cole-h Awaiting requested review from cole-h cole-h is a code owner

@dasJ dasJ Awaiting requested review from dasJ dasJ is a code owner

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

@ryantm ryantm Awaiting requested review from ryantm ryantm is a code owner

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: cinnamon Desktop environment 6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: darwin Running or building packages on Darwin 6.topic: emacs Text editor 6.topic: flakes The experimental Nix feature 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: lib The Nixpkgs function library 6.topic: mate The MATE Desktop Environment 6.topic: module system About "NixOS" module system internals 6.topic: nim Nim programing language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: pantheon The Pantheon desktop environment 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim Advanced text editor 6.topic: vscode A free and versatile code editor that supports almost every major programming language. 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CoreFoundation.tbd hook breaks darwin -> non-darwin cross-compilation