diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-04-16 19:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 19:17:17 +0200 |
| commit | 99eb739670559ac675edad93c862a8540953485d (patch) | |
| tree | 3059c267dd92bfba73e55264bc36231b0203799d /pkgs | |
| parent | 5c2e32bdda3475d32f30deaf75fe164560676967 (diff) | |
| parent | 2151e9af9cbed96a1353ec8964446a47204d62b0 (diff) | |
Merge pull request #168942 from LibreCybernetics/staging-next-fix-archiveopteryx
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/mail/archiveopteryx/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 85a0756a11884..2bcd87c3b84d2 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -21,13 +21,14 @@ stdenv.mkDerivation rec { ''; # fix build on gcc7+ and gcc11+ - NIX_CFLAGS_COMPILE = builtins.toString [ + NIX_CFLAGS_COMPILE = [ "-std=c++11" # c++17+ has errors "-Wno-error=builtin-declaration-mismatch" "-Wno-error=deprecated-copy" "-Wno-error=implicit-fallthrough" - "-Wno-error=mismatched-new-delete" "-Wno-error=nonnull" + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ + "-Wno-error=mismatched-new-delete" ]; buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; |