From f26b42f6c07a00dd2cecb006846e672b88748b84 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Apr 2024 23:51:05 -0400 Subject: [PATCH] gnu: qt-creator: Fix patch-perfparser phase. This is a follow-up to f83bdd7e00 ("gnu: qt-creator: Patch file names of demangling libraries.") * gnu/packages/qt.scm (qt-creator) [phases] : Adjust demangler.cpp file name. Change-Id: I72c517636bf866b57daa5d56dd8db643b0669a88 --- gnu/packages/qt.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c9a10c7441..2f052f7b42 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -5226,7 +5226,8 @@ including @i{fix-its} for automatic refactoring.") #~(modify-phases %standard-phases (add-after 'unpack 'patch-perfparser ;; XXX: The 'patch-perfparser' phase is also used by the 'hotspot' - ;; package; keep its copy in sync. + ;; package; keep its copy in sync (paying attention to the + ;; different demangler.cpp file name). (lambda* (#:key inputs #:allow-other-keys) ;; perfparser attempts to dynamically load the demangle ;; libraries; use their absolute file name to avoid having to @@ -5239,7 +5240,7 @@ including @i{fix-its} for automatic refactoring.") (lambda () (search-input-file inputs "lib/librustc_demangle.so")) #:unwind? #t))) - (substitute* "3rdparty/perfparser/app/demangler.cpp" + (substitute* "src/tools/perfparser/app/demangler.cpp" (("loadDemangleLib\\(QStringLiteral\\(\"rustc_demangle\")" all) (if librustc_demangle.so