diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-08-12 20:56:19 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-08-12 20:58:42 +0100 |
| commit | c9791d9a0b9a253fa5cc1c9f2c9fe27a88ef1bd5 (patch) | |
| tree | a3f2b99c44b59ec4c71b2698d3785c9678a204ba /pkgs/tools/X11 | |
| parent | 9f039b93af2d6865640c173aed9aaeb763dc5a47 (diff) | |
libstrangle: pull gcc-13 fix pending upstream inclusion
Without thenc change build on `gcc-13` fails as:
src/vulkan/overlay.cpp:113:25: error: 'fprintf' was not declared in this scope
src/vulkan/overlay.cpp:41:1: note: 'stderr' is defined in header '<cstdio>';
this is probably fixable by adding '#include <cstdio>'
40 | #include "limiter.h"
+++ |+#include <cstdio>
Diffstat (limited to 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/libstrangle/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix index 037c878bd12e7..218f75f67cb97 100644 --- a/pkgs/tools/X11/libstrangle/default.nix +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, libGL, libX11 }: +{ lib, stdenv, fetchFromGitLab, fetchpatch, libGL, libX11 }: stdenv.mkDerivation rec { pname = "libstrangle"; @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; patches = [ - ./nixos.patch + ./nixos.patch + # Pull the fix pending upstream inclusion for gcc-13: + # https://gitlab.com/torkel104/libstrangle/-/merge_requests/29 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://gitlab.com/torkel104/libstrangle/-/commit/4e17025071de1d99630febe7270b4f63056d0dfa.patch"; + hash = "sha256-AKMHAZhCPcn62pi4fBGhw2r8SNSkCDMUCpR3IlmJ7wQ="; + }) ]; postPatch = '' |