From 93fda7fa66b7c6697a428ab628872fc86b9b09e1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 7 Mar 2021 00:30:36 -0500 Subject: [PATCH 2/2] gnu: nimf: Disable qt4 support. * gnu/packages/language.scm (nimf) [arguments]: Add new phase 'disable-qt4 and modify phase 'patch-paths. [inputs]: Remove qt4. --- gnu/packages/language.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index db7b9d7f33..be1c5d4191 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -105,7 +105,15 @@ "/share/gtk-doc/html")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-flags + (add-after 'unpack 'disable-qt4 + (lambda _ + (substitute* '("configure.ac" "modules/clients/Makefile.am") + (("\\[QtGui\\]") + "[Qt5Gui]") + ((" qt4") + "")) + #t)) + (add-after 'disable-qt4 'patch-flags (lambda* (#:key inputs #:allow-other-keys) (substitute* "configure.ac" (("-Werror") @@ -139,10 +147,6 @@ (("\\$\\(GTK2_LIBDIR\\)") (string-append (assoc-ref outputs "gtk") "/lib"))) - (substitute* "modules/clients/qt4/Makefile.am" - (("\\$\\(QT4_LIB_DIR\\)") - (string-append (assoc-ref outputs "qt") - "/lib"))) (substitute* "modules/clients/qt5/Makefile.am" (("\\$\\(QT5_IM_MODULE_DIR\\)") (string-append (assoc-ref outputs "qt") @@ -182,7 +186,6 @@ ("hangul" ,libhangul) ("m17n-db" ,m17n-db) ("m17n-lib" ,m17n-lib) - ("qt-4" ,qt-4) ("qtbase" ,qtbase) ("rime" ,librime) ("rsvg" ,librsvg) -- 2.30.1