diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-01-31 12:07:39 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-02-01 16:53:31 +0100 |
| commit | 6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf (patch) | |
| tree | db50f72540b35254fa4523ca47058b520b63fd0c | |
| parent | b3195fa1aff668f3754d00b5b39953c5dbe10f52 (diff) | |
| download | nixpkgs-6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf.tar nixpkgs-6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf.tar.gz nixpkgs-6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf.tar.bz2 nixpkgs-6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf.tar.lz nixpkgs-6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf.tar.xz nixpkgs-6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf.tar.zst nixpkgs-6930b5bda8431f2cdb12fecdb26d9d12bec7c4cf.zip | |
lyx, rr, linuxPackgaes.systemtap: fixup build with gcc12
| -rw-r--r-- | pkgs/applications/misc/lyx/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/rr/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index d1a19eeccc5..921ae570bca 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -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 = [ diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index e9437d718cf..40a7909f34a 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -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 . ''; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index cadf9b9eeb1..4f7c87d8246 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -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 |