Merge #206907: stdenv: gcc11 -> gcc12
This commit is contained in:
commit
9287f4461d
@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
|
||||
lv2 libX11 libGL libGLU mesa
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/lv2
|
||||
cp -r aether.lv2 $out/lib/lv2
|
||||
|
@ -63,6 +63,12 @@ stdenv.mkDerivation rec {
|
||||
"-DWARNINGS_ARE_ERRORS=ON"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=mismatched-new-delete"
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a
|
||||
# bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access
|
||||
|
@ -38,6 +38,11 @@ stdenv.mkDerivation rec {
|
||||
pcre2
|
||||
] ++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=free-nonheap-object"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mimic \
|
||||
--run "export ALSA_PLUGIN_DIR=${alsa-plugins}/lib/alsa-lib"
|
||||
|
@ -117,6 +117,10 @@ stdenv.mkDerivation rec {
|
||||
--subst-var-by mamePath "$out/opt/mame"
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "MAME";
|
||||
|
@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ glfw3 gtk3 libpng12 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=format-truncation"
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lpthread";
|
||||
|
||||
buildPhase = ''
|
||||
|
@ -11,6 +11,12 @@ mkDerivation rec {
|
||||
sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng=";
|
||||
};
|
||||
|
||||
# Needed with GCC 12
|
||||
postPatch = ''
|
||||
sed '1i#include <iterator>' -i src/lyxfind.cpp
|
||||
sed '1i#include <cstring>' -i src/insets/InsetListings.cpp
|
||||
'';
|
||||
|
||||
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, pkg-config, cmake, ninja, yasm
|
||||
, libjpeg, openssl_1_1, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
|
||||
, openh264, usrsctp, libevent, libvpx
|
||||
@ -31,6 +31,14 @@ stdenv.mkDerivation {
|
||||
mesa libepoxy libglvnd
|
||||
];
|
||||
|
||||
patches = [
|
||||
# GCC 12 Fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch";
|
||||
hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Building as a shared library isn't officially supported and may break at any time.
|
||||
"-DBUILD_SHARED_LIBS=OFF"
|
||||
|
@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-VaUr63v7mzhh4VBghH7a7qrqOYwl6vucmmKzTi9yAjY=";
|
||||
}) ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=deprecated-declarations"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/bin
|
||||
mv $out/octopus $out/bin
|
||||
|
@ -60,9 +60,13 @@ stdenv.mkDerivation rec {
|
||||
--prefix PATH : "$out/share/cbmc" \
|
||||
'';
|
||||
|
||||
# fix "argument unused during compilation"
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
|
||||
"-Wno-unused-command-line-argument";
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
# fix "argument unused during compilation"
|
||||
"-Wno-unused-command-line-argument"
|
||||
];
|
||||
|
||||
# TODO: add jbmc support
|
||||
cmakeFlags = [ "-DWITH_JBMC=OFF" "-Dsat_impl=cadical" "-Dcadical_INCLUDE_DIR=${cadical.dev}/include" ];
|
||||
|
@ -54,6 +54,12 @@ stdenv.mkDerivation rec {
|
||||
] else [ "-DUSE_CUDA=OFF" ])
|
||||
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
"-Wno-error=uninitialized"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \
|
||||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
|
@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/bin
|
||||
'';
|
||||
|
@ -49,6 +49,12 @@ stdenv.mkDerivation {
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-parameter"
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd src
|
||||
|
@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
|
||||
-L${sqlite.out}/lib";
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
# Be sure to keep the statically linked libraries
|
||||
dontDisableStatic = true;
|
||||
|
||||
|
@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
# Needed with GCC 11
|
||||
"-Wno-error=misleading-indentation"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=nonnull"
|
||||
"-Wno-error=stringop-overflow"
|
||||
"-Wno-error=use-after-free"
|
||||
]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
|
||||
|
||||
patchPhase = lib.optionalString stdenv.isDarwin ''
|
||||
|
@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library to import various 3D model formats";
|
||||
homepage = "https://www.assimp.org/";
|
||||
|
@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=stringop-overflow"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ];
|
||||
|
@ -30,6 +30,11 @@ buildGoModule {
|
||||
export GOARCH=$(go env GOHOSTARCH)
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
ninjaBuildPhase
|
||||
'';
|
||||
|
@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
|
||||
# Do not build static libraries
|
||||
cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An opensource implementation of ZRTP keys exchange protocol. Part of the Linphone project.";
|
||||
homepage = "https://gitlab.linphone.org/BC/public/bzrtp";
|
||||
|
@ -30,11 +30,14 @@ stdenv.mkDerivation rec {
|
||||
"-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT="
|
||||
];
|
||||
|
||||
patches = # From debian
|
||||
[ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
|
||||
./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
|
||||
./Install-contribs-lib.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
|
||||
patches = [
|
||||
# From debian
|
||||
./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
|
||||
./Fixing_ZLIB_configuration_in_shared_CMakeLists.patch
|
||||
./Install-contribs-lib.patch
|
||||
# From arch
|
||||
./fix-missing-include-time.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
|
||||
|
||||
# fails with "Unable to find executable:
|
||||
# /build/clucene-core-2.3.3.4/build/bin/cl_test"
|
||||
|
@ -0,0 +1,49 @@
|
||||
From c1c2000c35ff39b09cb70fbdf66a107d3b17a674 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Wed, 12 Oct 2022 08:40:49 +0200
|
||||
Subject: [PATCH] Fix missing #include <time.h>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
At least on recent Fedora 37 beta, building now failed with
|
||||
|
||||
> CLucene/document/DateTools.cpp:26:19: error: ‘gmtime’ was not declared in this scope
|
||||
> 26 | tm *ptm = gmtime(&secs);
|
||||
> | ^~~~~~
|
||||
|
||||
etc.
|
||||
|
||||
As it turns out, after 22f9d40320e3deeaa8d6aaa7a770077c20a21dae "git-svn-id:
|
||||
https://clucene.svn.sourceforge.net/svnroot/clucene/branches/lucene2_3_2@2672
|
||||
20ef185c-fe11-0410-a618-ba9304b01011" on 2008-06-26 had commented out
|
||||
_CL_TIME_WITH_SYS_TIME in clucene-config.h.cmake as "not actually used for
|
||||
anything", then cceccfb52917b5f4da447f1cf20c135952d41442 "Presenting DateTools
|
||||
and deprecating DateField. DateTools still requires some testing and its own
|
||||
unit testing" on 2008-06-29 had introduced this use of it (into then
|
||||
src/CLucene/document/DateTools.H). And apparently most build environments have
|
||||
silently been happy ever since when the dead leading check for
|
||||
_CL_TIME_WITH_SYS_TIME didn't include both <sys/time.h> and <time.h>, but the
|
||||
following check for _CL_HAVE_SYS_TIME_H only included <sys/time.h> but not
|
||||
<time.h>.
|
||||
---
|
||||
src/shared/CLucene/clucene-config.h.cmake | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/shared/CLucene/clucene-config.h.cmake b/src/shared/CLucene/clucene-config.h.cmake
|
||||
index bd8683a5..6fe0f92b 100644
|
||||
--- a/src/shared/CLucene/clucene-config.h.cmake
|
||||
+++ b/src/shared/CLucene/clucene-config.h.cmake
|
||||
@@ -100,8 +100,7 @@ ${SYMBOL__T}
|
||||
//#cmakedefine _CL_STAT_MACROS_BROKEN
|
||||
|
||||
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
|
||||
-//not actually used for anything...
|
||||
-//#cmakedefine _CL_TIME_WITH_SYS_TIME 1
|
||||
+#cmakedefine _CL_TIME_WITH_SYS_TIME 1
|
||||
|
||||
/* Define that we will be using -fvisibility=hidden, and
|
||||
* make public classes visible using __attribute__ ((visibility("default")))
|
||||
--
|
||||
2.37.3
|
||||
|
@ -24,6 +24,8 @@ stdenv.mkDerivation {
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=range-loop-construct"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=deprecated-declarations"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,13 +2,21 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gsmlib";
|
||||
version = "unstable-2017-10-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "x-logLT";
|
||||
repo = "gsmlib";
|
||||
rev = "4f794b14450132f81673f7d3570c5a859aecf7ae";
|
||||
sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-std=c++14"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to access GSM mobile phones through GSM modems";
|
||||
homepage = "https://github.com/x-logLT/gsmlib";
|
||||
|
@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libbsd microsoft_gsl ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-parameter"
|
||||
"-Wno-error=misleading-indentation"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/twosigma/iqueue";
|
||||
description = "Indexed queue";
|
||||
|
@ -46,6 +46,11 @@ in stdenv.mkDerivation rec {
|
||||
"-DBLADERF_GROUP=bladerf"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=address"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Emulate a Cisco-style telnet command-line interface";
|
||||
homepage = "http://sites.dparrish.com/libcli";
|
||||
|
@ -15,14 +15,17 @@ stdenv.mkDerivation rec {
|
||||
"-DDYND_BUILD_BENCHMARKS=OFF"
|
||||
];
|
||||
|
||||
# added to fix build with gcc7+
|
||||
NIX_CFLAGS_COMPILE = builtins.toString [
|
||||
# added to fix build with gcc7+
|
||||
"-Wno-error=implicit-fallthrough"
|
||||
"-Wno-error=nonnull"
|
||||
"-Wno-error=tautological-compare"
|
||||
"-Wno-error=class-memaccess"
|
||||
"-Wno-error=parentheses"
|
||||
"-Wno-error=deprecated-copy"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
|
||||
"--with-x-locale-root=${libX11.out}/share/X11/locale"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
preBuild = lib.optionalString stdenv.isDarwin ''
|
||||
sed -i 's/,--version-script=.*$//' Makefile
|
||||
'';
|
||||
|
@ -10,10 +10,16 @@ stdenv.mkDerivation rec {
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/octomap";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=deprecated-declarations"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A probabilistic, flexible, and compact 3D mapping library for robotic systems";
|
||||
homepage = "https://octomap.github.io/";
|
||||
|
@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ readline libmysqlclient postgresql sqlite ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-std=c++14"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Extremely lightweight but extensible database access library written in C";
|
||||
|
@ -36,8 +36,16 @@ stdenv.mkDerivation rec {
|
||||
"tools"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"
|
||||
+ lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field -faligned-allocation";
|
||||
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
|
||||
"-Wno-error=deprecated-copy"
|
||||
"-Wno-error=pessimizing-move"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=unused-private-field"
|
||||
"-faligned-allocation"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORTABLE=1"
|
||||
|
@ -62,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=include"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
export HIP_DEVICE_LIB_PATH=${rocm-device-libs}/amdgcn/bitcode
|
||||
'' + lib.optionalString (!buildTests) ''
|
||||
|
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake python3 jq ];
|
||||
buildInputs = [ libX11 libXext zlib ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
"-Wno-error=uninitialized"
|
||||
];
|
||||
|
||||
# Make sure we include the drivers and icd files in the output as the cmake
|
||||
# generated install command only puts in the spirv-tools stuff.
|
||||
installPhase = ''
|
||||
|
@ -1,4 +1,9 @@
|
||||
{lib, stdenv, fetchFromGitHub, cmake}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unittest-cpp";
|
||||
@ -11,6 +16,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0sxb3835nly1jxn071f59fwbdzmqi74j040r81fanxyw3s1azw0i";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# GCC12 Patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/unittest-cpp/unittest-cpp/pull/185/commits/f361c2a1034c02ba8059648f9a04662d6e2b5553.patch";
|
||||
hash = "sha256-xyhV2VBelw/uktUXSZ3JBxgG+8/Mout/JiXEZVV2+2Y=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
doCheck = false;
|
||||
|
@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=parentheses";
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=parentheses"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=nonnull"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
|
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
|
||||
sed '7i#include <math.h>' -i src/Scheduler.cc
|
||||
sed '1i#include <ctime>' -i src/test-monitor/test-monitor.cc
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
|
@ -19,6 +19,7 @@ let
|
||||
nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ];
|
||||
buildInputs = [ elfutils gettext ];
|
||||
enableParallelBuilding = true;
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; # Needed with GCC 12
|
||||
};
|
||||
|
||||
## a kernel build dir as expected by systemtap
|
||||
|
@ -47,6 +47,11 @@ stdenv.mkDerivation rec {
|
||||
wayland
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
@ -44,6 +44,11 @@ let
|
||||
"VERSION=${version}"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
meta = common.meta // {
|
||||
maintainers = with lib.maintainers;
|
||||
common.meta.maintainers ++ [ skeidel ];
|
||||
|
@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_C_FLAGS=-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=stringop-overflow"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
|
@ -38,6 +38,14 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
makeFlags = [ "build-core" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=address"
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
@ -30,11 +30,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE =
|
||||
"-Wno-error=deprecated-declarations" +
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=address"
|
||||
"-Wno-error=use-after-free"
|
||||
# Avoid GL_GLEXT_VERSION double definition
|
||||
" -DNO_SDL_GLEXT"
|
||||
;
|
||||
];
|
||||
|
||||
# To avoid problems finding SDL_types.h.
|
||||
configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ];
|
||||
|
@ -94,6 +94,11 @@ stdenv.mkDerivation {
|
||||
"-DDOWNLOAD_TITLE_SEQUENCES=OFF"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${objects-src} $sourceRoot/data/object
|
||||
cp -r ${title-sequences-src} $sourceRoot/data/sequence
|
||||
|
@ -85,6 +85,11 @@ stdenv.mkDerivation rec {
|
||||
systemd
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=mismatched-new-delete"
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs scripts
|
||||
|
||||
|
@ -65,8 +65,8 @@ assert (stdenv.hostPlatform.isx86_64 -> versions.majorMinor version != "5.4");
|
||||
# Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
|
||||
GCC_PLUGIN_LATENT_ENTROPY = yes;
|
||||
|
||||
GCC_PLUGIN_STRUCTLEAK = yes; # A port of the PaX structleak plugin
|
||||
GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = yes; # Also cover structs passed by address
|
||||
GCC_PLUGIN_STRUCTLEAK = option yes; # A port of the PaX structleak plugin
|
||||
GCC_PLUGIN_STRUCTLEAK_BYREF_ALL = option yes; # Also cover structs passed by address
|
||||
GCC_PLUGIN_STACKLEAK = whenAtLeast "4.20" yes; # A port of the PaX stackleak plugin
|
||||
GCC_PLUGIN_RANDSTRUCT = whenOlder "5.19" yes; # A port of the PaX randstruct plugin
|
||||
GCC_PLUGIN_RANDSTRUCT_PERFORMANCE = whenOlder "5.19" yes;
|
||||
|
@ -25,6 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dpdk_19_11
|
||||
libconfig
|
||||
@ -38,6 +39,12 @@ in stdenv.mkDerivation rec {
|
||||
libbpf
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
"-Wno-error=uninitialized"
|
||||
];
|
||||
|
||||
# binaries will segfault otherwise
|
||||
dontStrip = true;
|
||||
|
||||
|
@ -46,6 +46,12 @@ stdenv.mkDerivation rec {
|
||||
RTE_SDK = dpdk;
|
||||
GUI = lib.optionalString withGtk "true";
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=address"
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
# requires symbols from this file
|
||||
NIX_LDFLAGS = "-lrte_net_bond";
|
||||
|
||||
|
@ -60,6 +60,11 @@ let
|
||||
(lib.optionalString (!useClang) "-DUSE_LD=GOLD")
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=missing-template-keyword"
|
||||
];
|
||||
|
||||
inherit patches;
|
||||
|
||||
# fix up the use of the very weird and custom 'fdb_install' command by just
|
||||
|
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=stringop-overflow"
|
||||
"-Wno-error=uninitialized"
|
||||
];
|
||||
|
||||
postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles";
|
||||
|
||||
meta = {
|
||||
|
@ -78,6 +78,8 @@ in stdenv.mkDerivation {
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=format-truncation"
|
||||
"-Wno-error=stringop-truncation"
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
@ -887,6 +887,11 @@ self: super:
|
||||
"--disable-tls"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
|
||||
( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
|
||||
|
@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-77X+AvHFWfYYIio3c+EYf11jg/1IbYhNUweRIDHMOZw=";
|
||||
};
|
||||
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/TigerVNC/tigervnc/pull/1383.patch";
|
||||
@ -65,6 +64,10 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "out"}/bin"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
postBuild = lib.optionalString stdenv.isLinux ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast"
|
||||
export CXXFLAGS="$CXXFLAGS -fpermissive"
|
||||
|
@ -53,14 +53,17 @@ stdenv.mkDerivation rec {
|
||||
"-Dversion=${version}"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=address"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-Wno-sometimes-uninitialized"
|
||||
"-Wno-tautological-pointer-compare"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"-Wno-array-bounds"
|
||||
"-Wno-free-nonheap-object"
|
||||
"-Wno-stringop-truncation"
|
||||
]);
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
@ -24,7 +24,11 @@ in stdenv.mkDerivation rec {
|
||||
pname = "blobfuse";
|
||||
inherit version src;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=catch-value";
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=catch-value"
|
||||
];
|
||||
|
||||
buildInputs = [ curl gnutls libgcrypt libuuid fuse boost cpplite ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-std=c++14"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp iDSK $out/bin
|
||||
|
@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ liblockfile ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=format-overflow"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin $out/man/man1
|
||||
|
@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ libbfd zlib libiberty ];
|
||||
makeFlags = [ "wimboot.x86_64.efi" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=array-bounds"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/wimboot/
|
||||
cp wimboot.x86_64.efi $out/share/wimboot
|
||||
|
@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
|
||||
"SD_NOTIFY=1"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=maybe-uninitialized"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=${placeholder "out"}/etc"
|
||||
];
|
||||
|
@ -18,6 +18,11 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ libubox json_c ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=dangling-pointer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tiny QMI command line utility";
|
||||
homepage = "https://git.openwrt.org/?p=project/uqmi.git;a=summary";
|
||||
|
@ -51,6 +51,11 @@ let
|
||||
--replace '"clang++"' '"clang++-UNSUPPORTED"'
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=use-after-free"
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
buildPhase = ''
|
||||
common="$makeFlags -j$NIX_BUILD_CORES"
|
||||
|
@ -40,6 +40,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=dangling-pointer"
|
||||
];
|
||||
|
||||
preInstall = lib.optionalString withDriver ''
|
||||
mkdir -p $out/${python3.pkgs.python.sitePackages}/drivers/linux
|
||||
mv $CHIPSEC_BUILD_LIB/chipsec/helper/linux/chipsec.ko \
|
||||
|
@ -29,7 +29,11 @@ stdenv.mkDerivation rec {
|
||||
"iasl"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-O3";
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-O3"
|
||||
# Needed with GCC 12
|
||||
"-Wno-dangling-pointer"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# Needed with GCC 12
|
||||
"-Wno-error=mismatched-new-delete"
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "-msse2" "" --replace "-DUSE_SSE2" ""
|
||||
|
@ -14258,7 +14258,7 @@ with pkgs;
|
||||
num =
|
||||
if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6
|
||||
else if (stdenv.targetPlatform.isAarch64 && stdenv.isLinux) then 9
|
||||
else 11;
|
||||
else 12;
|
||||
numS = toString num;
|
||||
in {
|
||||
gcc = pkgs.${"gcc${numS}"};
|
||||
@ -23561,7 +23561,10 @@ 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 clangStdenv
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
vte-gtk4 = vte.override {
|
||||
|
Loading…
Reference in New Issue
Block a user