[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/30: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.
From: |
Hartmut Goebel |
Subject: |
04/30: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins. |
Date: |
Fri, 13 Oct 2017 09:29:02 -0400 (EDT) |
htgoebel pushed a commit to branch master
in repository guix.
commit 4eb972b95cbb9fa6c27283dd4b4ec9581838e85e
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 0f911dc..4df2674 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1890,6 +1890,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")))
- branch master updated (dad66da -> 109461f), Hartmut Goebel, 2017/10/13
- 02/30: gnu: qt: Fix install paths in submodules., Hartmut Goebel, 2017/10/13
- 09/30: gnu: Update prison to 5.37.0., Hartmut Goebel, 2017/10/13
- 04/30: gnu: qtwebkit: Fix rpath for the qmlwebkit plugins.,
Hartmut Goebel <=
- 07/30: gnu: grantlee: Enable all tests., Hartmut Goebel, 2017/10/13
- 01/30: gnu: qtbase: Use a more standard directory layout., Hartmut Goebel, 2017/10/13
- 06/30: gnu: kde-framworks: Fix installation directories., Hartmut Goebel, 2017/10/13
- 21/30: gnu: kio: Remove unused input., Hartmut Goebel, 2017/10/13
- 16/30: gnu: kdnssd: Enable service discovery on local network via avahi., Hartmut Goebel, 2017/10/13
- 18/30: gnu: bluez-qt: Install udev-rules., Hartmut Goebel, 2017/10/13
- 10/30: gnu: kcoreaddons: Add native-input shared-mime-info and a comment., Hartmut Goebel, 2017/10/13
- 03/30: gnu: qwt: Adjust installation directory layout., Hartmut Goebel, 2017/10/13
- 22/30: gnu: kio: Adopt a patch from Nix., Hartmut Goebel, 2017/10/13
- 26/30: gnu: kglobalaccel: Reduce the number of warnings when configuring., Hartmut Goebel, 2017/10/13