lyx, rr, linuxPackgaes.systemtap: fixup build with gcc12
This commit is contained in:
parent
b3195fa1af
commit
6930b5bda8
|
@ -11,6 +11,12 @@ mkDerivation rec {
|
||||||
sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng=";
|
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
|
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
|
||||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|
|
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
|
substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
|
||||||
sed '7i#include <math.h>' -i src/Scheduler.cc
|
sed '7i#include <math.h>' -i src/Scheduler.cc
|
||||||
|
sed '1i#include <ctime>' -i src/test-monitor/test-monitor.cc
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ let
|
||||||
nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ];
|
nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ];
|
||||||
buildInputs = [ elfutils gettext ];
|
buildInputs = [ elfutils gettext ];
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; # Needed with GCC 12
|
||||||
};
|
};
|
||||||
|
|
||||||
## a kernel build dir as expected by systemtap
|
## a kernel build dir as expected by systemtap
|
||||||
|
|
Loading…
Reference in a new issue