guix-commits
[Top][All Lists]
Advanced

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

04/23: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.


From: Hartmut Goebel
Subject: 04/23: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.
Date: Fri, 22 Sep 2017 08:55:29 -0400 (EDT)

htgoebel pushed a commit to branch wip-qt-paths
in repository guix.

commit 95d2d57d1a0b20fb0bbf1f5c2363d695d6c4c394
Author: Hartmut Goebel <address@hidden>
Date:   Sat Sep 2 23:20:15 2017 +0200

    gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.
    
    After the qtbase installation directories have been changed,
    the relative RPATH in the libs no longer matched the sructure.
    
    * gnu/packages/qt.scm(qtwebkit)[arguments]: New phase
      fix-qmlwebkit-plugins-rpath.
---
 gnu/packages/qt.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 8070e27..263e025 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1672,6 +1672,15 @@ different kinds of sliders, and much more.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
+         (add-before 'configure 'fix-qmlwebkit-plugins-rpath
+           (lambda _
+             (substitute* 
"Source/WebKit/qt/declarative/experimental/experimental.pri"
+               (("RPATHDIR_RELATIVE_TO_DESTDIR = \\.\\./\\.\\./lib")
+                "RPATHDIR_RELATIVE_TO_DESTDIR = ../../../../../lib"))
+             (substitute* "Source/WebKit/qt/declarative/public.pri"
+               (("RPATHDIR_RELATIVE_TO_DESTDIR = \\.\\./\\.\\./lib")
+                "RPATHDIR_RELATIVE_TO_DESTDIR = ../../../../lib"))
+             #t))
          (replace 'configure
                   (lambda* (#:key outputs #:allow-other-keys)
                     (let ((out (assoc-ref outputs "out")))



reply via email to

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