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

darwin packages: Get ready for cross #122527

Merged
merged 1 commit into from
May 11, 2021

Conversation

Ericson2314
Copy link
Member

Motivation for this change

If things build fine with stdenvNoCC, let them use that. If tools
might be prefixed, prepare for that.

This is a mass rebuild, but I don't think the final stdenv should be any different in contents, so I think it's safe.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label May 11, 2021
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 1-10 labels May 11, 2021
pkgs/os-specific/darwin/apple-source-releases/default.nix Outdated Show resolved Hide resolved
callPackage = self.newScope { inherit appleDerivation; };
appleDerivation' = stdenv: appleDerivation'' stdenv pname version sdkName sha256;
appleDerivation = appleDerivation' stdenv;
callPackage = self.newScope { inherit appleDerivation' appleDerivation; };
Copy link
Member

Choose a reason for hiding this comment

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

How about appleDerivationNoCC?

Copy link
Member Author

Choose a reason for hiding this comment

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

Well appleDerivation' takes an arbitrary stdenv. I think I would like that to just replace appleDerivation eventually.

@Mic92
Copy link
Member

Mic92 commented May 11, 2021

Does this allow to cross-compile darwin on Linux?

@Ericson2314 Ericson2314 force-pushed the darwin-no-cc-where-possible branch 2 times, most recently from f013127 to d4a63a9 Compare May 11, 2021 17:02
@Ericson2314
Copy link
Member Author

@Mic92 No, but I believe it is "getting the mass rebuilds out of the way". I have another commit with an actual attempt at that which I think might work better after @thefloweringash's darwin -> darwin attempt.

If things build fine with `stdenvNoCC`, let them use that. If tools
might be prefixed, prepare for that, either by directly splicing or just
using the env vars provided by the wrapper setup-hooks.

Co-authored-by: Dmitry Kalinkin <[email protected]>
@Ericson2314 Ericson2314 force-pushed the darwin-no-cc-where-possible branch from d4a63a9 to 7bba32a Compare May 11, 2021 20:11
@Ericson2314
Copy link
Member Author

Rebuilt darwin stdenv and hello just to double check.

@Ericson2314 Ericson2314 merged commit 1f52066 into NixOS:staging May 11, 2021
@Ericson2314 Ericson2314 deleted the darwin-no-cc-where-possible branch May 11, 2021 22:59
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 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants