guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: nimf: Disable qt4 support.


From: guix-commits
Subject: 02/02: gnu: nimf: Disable qt4 support.
Date: Sun, 7 Mar 2021 15:50:01 -0500 (EST)

lfam pushed a commit to branch master
in repository guix.

commit 76c32fcab4e476181fffba2710166b6ac060290c
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Sun Mar 7 00:30:36 2021 -0500

    gnu: nimf: Disable qt4 support.
    
    * gnu/packages/language.scm (nimf) [arguments]: Add new phase 'disable-qt4
    and modify phase 'patch-paths.
    [inputs]: Remove qt4.
    
    Signed-off-by: Leo Famulari <leo@famulari.name>
---
 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 9bf9427..d4b9b8d 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -103,7 +103,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")
@@ -137,10 +145,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")
@@ -180,7 +184,6 @@
        ("hangul" ,libhangul)
        ("m17n-db" ,m17n-db)
        ("m17n-lib" ,m17n-lib)
-       ("qt-4" ,qt-4)
        ("qtbase" ,qtbase)
        ("rime" ,librime)
        ("rsvg" ,librsvg)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]