BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

furnace, boringssl, gloox, xorg.xf86videovmware: gcc12 fixups

Browse source
This commit is contained in:
Vladimír Čunát 2023-02-05 11:57:01 +01:00
parent c2fb9453ab
commit 44cb005294
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/furnace/default.nix
View file

@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
"-DWARNINGS_ARE_ERRORS=ON" "-DWARNINGS_ARE_ERRORS=ON"
]; ];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
# Needed with GCC 12 # Needed with GCC 12 but breaks on darwin (with clang)
"-Wno-error=mismatched-new-delete" "-Wno-error=mismatched-new-delete"
"-Wno-error=use-after-free" "-Wno-error=use-after-free"
]; ];

4
pkgs/development/libraries/boringssl/default.nix
View file

@ -30,8 +30,8 @@ buildGoModule {
export GOARCH=$(go env GOHOSTARCH) export GOARCH=$(go env GOHOSTARCH)
''; '';
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
# Needed with GCC 12 # Needed with GCC 12 but breaks on darwin (with clang)
"-Wno-error=stringop-overflow" "-Wno-error=stringop-overflow"
]; ];

7
pkgs/development/libraries/gloox/default.nix
View file

@ -14,6 +14,13 @@ stdenv.mkDerivation rec{
sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f"; sha256 = "1jgrd07qr9jvbb5hcmhrqz4w4lvwc51m30jls1fgxf1f5az6455f";
}; };
# needed since gcc12
postPatch = ''
sed '1i#include <ctime>' -i \
src/tests/{tag/tag_perf.cpp,zlib/zlib_perf.cpp} \
src/examples/*.cpp
'';
buildInputs = [ ] buildInputs = [ ]
++ lib.optional zlibSupport zlib ++ lib.optional zlibSupport zlib
++ lib.optional sslSupport openssl ++ lib.optional sslSupport openssl

1
pkgs/servers/x11/xorg/overrides.nix
View file

@ -592,6 +592,7 @@ self: super:
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker
NIX_CFLAGS_COMPILE = [ "-Wno-error=address" ]; # gcc12
meta = attrs.meta // { meta = attrs.meta // {
platforms = ["i686-linux" "x86_64-linux"]; platforms = ["i686-linux" "x86_64-linux"];
}; };