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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/development/libraries/vte/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ stdenv.mkDerivation rec {
];

# error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
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).


postPatch = ''
patchShebangs perf/*
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23373,7 +23373,7 @@ with pkgs;

vte = callPackage ../development/libraries/vte {
# Needs GCC ≥10 but aarch64 defaults to GCC 9.
stdenv = clangStdenv;
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc12Stdenv else stdenv;
wegank marked this conversation as resolved.
Show resolved Hide resolved
};

vte-gtk4 = vte.override {
Expand Down