From c544f794b41d5120d1749cc864a5175abddab052 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan 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