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.

Sign up for GitHub

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

Jump to bottom

vte: migrate to gcc12Stdenv #210979

Closed
wants to merge 1 commit into from
Closed

vte: migrate to gcc12Stdenv #210979

wants to merge 1 commit into from

Conversation

wegank
Copy link
Member

@wegank wegank commented Jan 15, 2023 •
edited
Loading

Description of changes

#201254

This can't go wrong, right?

Should be done after the gcc11 bump. Sorry!

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.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@wegank wegank mentioned this pull request Jan 15, 2023
Merged
13 tasks
@wegank wegank requested a review from vcunat January 15, 2023 21:12
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 101-500 labels Jan 15, 2023
jtojnar
jtojnar reviewed Jan 15, 2023
View reviewed changes
pkgs/development/libraries/vte/default.nix
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument";
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-Wno-unused-command-line-argument"
# https://github.com/NixOS/nixpkgs/issues/201254
+ lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
Copy link
Member

Choose a reason for hiding this comment

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

Should not there be a space or is musl orthogonal to GNU?

Copy link
Member Author

Choose a reason for hiding this comment

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

The latter. And the flag also seems to be needed when building with musl + aarch64 + gcc, according to #193930 (comment).

@wegank wegank marked this pull request as draft January 15, 2023 23:31
@wegank wegank closed this Jan 16, 2023
@wegank wegank deleted the vte-gcc branch January 16, 2023 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@vcunat vcunat Awaiting requested review from vcunat

@dasj19 dasj19 Awaiting requested review from dasj19

@amaxine amaxine Awaiting requested review from amaxine

@astsmtl astsmtl Awaiting requested review from astsmtl

@hedning hedning Awaiting requested review from hedning

@bobby285271 bobby285271 Awaiting requested review from bobby285271

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wegank @jtojnar @vcunat