guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: nimf: Use separate outputs for gtk and qt modules.


From: guix-commits
Subject: 01/02: gnu: nimf: Use separate outputs for gtk and qt modules.
Date: Sun, 7 Mar 2021 15:50:01 -0500 (EST)

lfam pushed a commit to branch master
in repository guix.

commit 2e9fe98a4bafd6243baa2a50f8771e49fae30d66
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Sat Mar 6 23:50:37 2021 -0500

    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.
    
    Signed-off-by: Leo Famulari <leo@famulari.name>
---
 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 576a1c1..9bf9427 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -83,7 +83,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
@@ -132,18 +132,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"



reply via email to

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