From 3f5d99e914f7878c124aa97bf2fe6bda27fbe802 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 30 Dec 2022 00:49:33 +0000 Subject: [PATCH] gdb: backport readline-8.2 fix Without the change gdb fails build on `readline-8.2` as: ../../gdb/completer.c: In function 'char* gdb_completion_word_break_characters_throw()': ../../gdb/completer.c:2014:10: error: invalid conversion from 'const char*' to 'char*' [-fpermissive] 2014 | return rl_completer_word_break_characters; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | const char* --- pkgs/development/tools/misc/gdb/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 4486636a9f50..53b02cc16ea8 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, targetPackages # Build time -, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages +, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time , ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { patches = [ ./debug-info-from-env.patch + # backport readline=8.2 support + (fetchpatch { + name = "readline-8.2.patch"; + url = "https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=1add37b567a7dee39d99f37b37802034c3fce9c4"; + hash = "sha256-KmQXylPAWNGXF8wtXCCArhUzHi+GUY8ii2Xpx8R08jE="; + }) ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch # Does not nave to be conditional. We apply it conditionally