[bug#29331] [PATCH 0/1] gnu: cool-retro-term: Fix qml path.

[bug#29331] [PATCH 0/1] gnu: cool-retro-term: Fix qml path.

[Oleg Pykhalov]

[-- Attachment #1: [PATCH 0/1] gnu: cool-retro-term: Fix qml path. --]
[-- Type: text/x-patch, Size: 872 bytes --]

From bb537a04a3fe5682de4b21c240b5bc5d92814311 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 17 Nov 2017 04:10:49 +0300
Subject: [PATCH 0/1] gnu: cool-retro-term: Fix qml path.

Hello Guix,

This patch fixes cool-retro-term start up.

There are some issues still:

default KB_LAYOUT_DIR:  "/gnu/store/…-cool-retro-term-1.0.0-1.e48719f/lib/qt5/qml/QMLTermWidget/kb-layouts"
QObject::connect: No such slot Konsole::TerminalDisplay_QML_140::close()
loadAllColorSchemes
Both point size and pixel size set. Using pixel size.
Session::run() - program: "/gnu/store/kqb373kyrdg5wxxnmka0mmdxh35c2gbk-bash-4.4.12/bin/bash"
Session::run() - arguments: ("")
started!

Oleg Pykhalov (1):
  gnu: cool-retro-term: Fix qml path.

 gnu/packages/terminals.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.15.0

[bug#29331] [PATCH 0/1] gnu: cool-retro-term: Fix qml path.

[Oleg Pykhalov]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH 1/1] gnu: cool-retro-term: Fix qml path. --]
[-- Type: text/x-patch, Size: 1560 bytes --]

From bb537a04a3fe5682de4b21c240b5bc5d92814311 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Fri, 17 Nov 2017 04:08:33 +0300
Subject: [PATCH 1/1] gnu: cool-retro-term: Fix qml path.

* gnu/packages/terminals.scm (cool-retro-term): Fix qml path.
---
 gnu/packages/terminals.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 2f74c5d5b..215511864 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -493,7 +493,7 @@ embedded kernel situations.")
                       (share (string-append out "/share")))
                  (substitute* '("qmltermwidget/qmltermwidget.pro")
                    (("INSTALL_DIR = \\$\\$\\[QT_INSTALL_QML\\]")
-                    (string-append "INSTALL_DIR = " out "/qml")))
+                    (string-append "INSTALL_DIR = " out "/lib/qt5/qml")))
                  (substitute* '("app/app.pro")
                    (("target.path \\+= /usr")
                     (string-append "target.path += " out))
@@ -514,7 +514,7 @@ embedded kernel situations.")
            (add-after 'install 'wrap-executable
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
-                      (qml "/qml"))
+                      (qml "/lib/qt5/qml"))
                  (wrap-program (string-append out "/bin/cool-retro-term")
                    `("QML2_IMPORT_PATH" ":" prefix
                      (,(string-append out qml)
-- 
2.15.0

[bug#29331] [PATCH 0/1] gnu: cool-retro-term: Fix qml path.

[Ludovic Courtès]

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> From bb537a04a3fe5682de4b21c240b5bc5d92814311 Mon Sep 17 00:00:00 2001
> From: Oleg Pykhalov <go.wigust@gmail.com>
> Date: Fri, 17 Nov 2017 04:08:33 +0300
> Subject: [PATCH 1/1] gnu: cool-retro-term: Fix qml path.
>
> * gnu/packages/terminals.scm (cool-retro-term): Fix qml path.

LGTM, thanks!

Ludo'.

bug#29331: [PATCH 0/1] gnu: cool-retro-term: Fix qml path.

[Oleg Pykhalov]

Hello Ludovic,

ludo@gnu.org (Ludovic Courtès) writes:

>> From bb537a04a3fe5682de4b21c240b5bc5d92814311 Mon Sep 17 00:00:00 2001
>> From: Oleg Pykhalov <go.wigust@gmail.com>
>> Date: Fri, 17 Nov 2017 04:08:33 +0300
>> Subject: [PATCH 1/1] gnu: cool-retro-term: Fix qml path.
>>
>> * gnu/packages/terminals.scm (cool-retro-term): Fix qml path.
>
> LGTM, thanks!

OK, pushed as 669be6acfe119a6a9fef4d97a0c14d4adb67dca5

Thanks,
Oleg.