Hi Leo!
Unfortunately, a package was added recently that depends on Qt 4 (telegram-desktop). Hopefully its dependency graph can be updated to use Qt 5.IIRC, telegram-desktop uses Qt5.Was it any of its dependencies? If so how can I narrow-it down using `guix graph`? I'll try to update it.
Just saw your message in IRC. For nimf, can you merge attached patches to master?
Regards, RG.
From c544f794b41d5120d1749cc864a5175abddab052 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <r...@raghavgururajan.name>
Date: Sat, 6 Mar 2021 23:50:37 -0500
Subject: [PATCH 1/2] gnu: nimf: Use separate outputs for gtk and qt modules.
* gnu/packages/language.scm (nimf) [outputs]: Add gtk and qt.
[arguments]<#:phases>['patch-paths]: Modify.
---
gnu/packages/language.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 651b2305c9..db7b9d7f33 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -85,7 +85,7 @@
(sha256
(base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc"))))
(build-system glib-or-gtk-build-system)
- (outputs '("out" "doc"))
+ (outputs '("out" "gtk" "qt" "doc"))
(arguments
`(#:imported-modules
(,@%glib-or-gtk-build-system-modules
@@ -134,18 +134,18 @@
"/bin:$GTK2_LIBDIR/libgtk2.0-0")))
(substitute* "modules/clients/gtk/Makefile.am"
(("\\$\\(GTK3_LIBDIR\\)")
- (string-append (assoc-ref outputs "out")
+ (string-append (assoc-ref outputs "gtk")
"/lib"))
(("\\$\\(GTK2_LIBDIR\\)")
- (string-append (assoc-ref outputs "out")
+ (string-append (assoc-ref outputs "gtk")
"/lib")))
(substitute* "modules/clients/qt4/Makefile.am"
(("\\$\\(QT4_LIB_DIR\\)")
- (string-append (assoc-ref outputs "out")
+ (string-append (assoc-ref outputs "qt")
"/lib")))
(substitute* "modules/clients/qt5/Makefile.am"
(("\\$\\(QT5_IM_MODULE_DIR\\)")
- (string-append (assoc-ref outputs "out")
+ (string-append (assoc-ref outputs "qt")
"/lib/qt5/plugins/inputmethods")))
(substitute* '("bin/nimf-settings/Makefile.am"
"data/apparmor-abstractions/Makefile.am"
--
2.30.1
From 93fda7fa66b7c6697a428ab628872fc86b9b09e1 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <r...@raghavgururajan.name>
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
OpenPGP_signature
Description: OpenPGP digital signature
