Skip to content

makeBinaryWrapper: remove cc dependency on aarch64-darwin#247164

Merged
ncfavier merged 1 commit intoNixOS:stagingfrom
tjni:make-wrapper-dependencies
Aug 5, 2023
Merged

makeBinaryWrapper: remove cc dependency on aarch64-darwin#247164
ncfavier merged 1 commit intoNixOS:stagingfrom
tjni:make-wrapper-dependencies

Conversation

@tjni
Copy link
Contributor

@tjni tjni commented Aug 4, 2023

Description of changes

This intends to address #172249 on aarch64-darwin (which was reverted in #174038). I think it should be possible now that #238323 is committed.

I am still building and testing this locally.

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/)
  • 23.11 Release Notes (or backporting 23.05 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.

@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 Aug 4, 2023
@tjni tjni marked this pull request as ready for review August 4, 2023 20:14
@tjni tjni requested a review from Ericson2314 as a code owner August 4, 2023 20:14
@tjni
Copy link
Contributor Author

tjni commented Aug 4, 2023

I was able to build luarocks with this change on staging.

@ncfavier would you be a good person to review this change?

@ncfavier
Copy link
Member

ncfavier commented Aug 4, 2023

@ofborg build makeBinaryWrapper makeBinaryWrapper.tests

@tjni tjni changed the title make-binary-wrapper: remove cc dependency on aarch64-darwin makeBinaryWrapper: remove cc dependency on aarch64-darwin Aug 4, 2023
@tjni
Copy link
Contributor Author

tjni commented Aug 4, 2023

Thank you for kicking off those builds. I'll change the commit message to makeBinaryWrapper after seeing the results.

@ncfavier
Copy link
Member

ncfavier commented Aug 4, 2023

Looking good!

@tjni
Copy link
Contributor Author

tjni commented Aug 4, 2023

Interesting! From ofborg:

error: builder for '/nix/store/wbw4m0379blgpwy4jzvmylzzg80nhvvh-make-binary-wrapper-test-cross.drv' failed with exit code 1;
       last 1 log lines:
       > expected x86_64, got Advanced Micro Devices X86-64
       For full logs, run 'nix log /nix/store/wbw4m0379blgpwy4jzvmylzzg80nhvvh-make-binary-wrapper-test-cross.drv'.
error: 1 dependencies of derivation '/nix/store/3vh8nzn9y75bm8ij6056kb1b4xdhbgd3-make-binary-wrapper-tests.drv' failed to build

@tjni
Copy link
Contributor Author

tjni commented Aug 4, 2023

That failure also occurs on master. Something to be looked at separately, but worth doing.

@ofborg build makeBinaryWrapper makeBinaryWrapper.tests

@ncfavier ncfavier merged commit ec2efb7 into NixOS:staging Aug 5, 2023
@tjni tjni deleted the make-wrapper-dependencies branch August 5, 2023 08:34
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.

2 participants