From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 30340@debbugs.gnu.org
Subject: [bug#30340] [PATCH 4/6] gnu: qtserialport: Use the store paths for dynamically loaded libs.
Date: Sat, 3 Feb 2018 20:25:03 +0100 [thread overview]
Message-ID: <20180203192505.29516-4-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20180203192505.29516-1-h.goebel@crazy-compilers.com>
Adobt the NixOS patches as of 2018-01-19 for qtserialport.
* gnu/packages/qt.scm(qtserialport)[#:phases]<patch-dlopen-paths>:
New phase.
---
gnu/packages/qt.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 45495dd6c..4fc108dac 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1002,6 +1002,18 @@ compositor libraries.")))
(inputs
`(("qtbase" ,qtbase)
("eudev" ,eudev)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'patch-dlopen-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/serialport/qtudev_p.h"
+ ;; Use the absolute path, otherwise the lib will be searched in
+ ;; the actual executable's RUNPATH, which may not include libudev.
+ (("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b)
+ (string-append a (assoc-ref inputs "eudev") "/lib/lib" b)))
+ #t))))))
(synopsis "Qt Serial Port module")
(description "The Qt Serial Port module provides the library for
interacting with serial ports from within Qt.")))
--
2.13.6
next prev parent reply other threads:[~2018-02-03 19:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-03 19:22 [bug#30340] [PATCH 0/6] Adopt NixOS patches for Qt5 Hartmut Goebel
2018-02-03 19:25 ` [bug#30340] [PATCH 1/6] gnu: qtbase: Use the store paths for other packages and dynamically loaded libs Hartmut Goebel
2018-02-03 19:25 ` [bug#30340] [PATCH 2/6] gnu: qtdeclarative: Add note about a patch NixOS has but we don't need Hartmut Goebel
2018-02-06 8:52 ` Danny Milosavljevic
2018-02-03 19:25 ` [bug#30340] [PATCH 3/6] gnu: qtscript: " Hartmut Goebel
2018-02-06 8:53 ` Danny Milosavljevic
2018-02-03 19:25 ` Hartmut Goebel [this message]
2018-02-06 8:55 ` [bug#30340] [PATCH 4/6] gnu: qtserialport: Use the store paths for dynamically loaded libs Danny Milosavljevic
2018-02-03 19:25 ` [bug#30340] [PATCH 5/6] gnu: qttools: Add note about a patch NixOS has but we don't need Hartmut Goebel
2018-02-06 8:54 ` Danny Milosavljevic
2018-02-03 19:25 ` [bug#30340] [PATCH 6/6] gnu: qtwebkit: " Hartmut Goebel
2018-02-06 8:57 ` Danny Milosavljevic
2018-02-06 9:00 ` [bug#30340] [PATCH 1/6] gnu: qtbase: Use the store paths for other packages and dynamically loaded libs Danny Milosavljevic
2018-02-06 11:57 ` Hartmut Goebel
2018-02-06 17:54 ` Danny Milosavljevic
2018-02-08 23:49 ` Hartmut Goebel
2018-02-07 16:16 ` Marius Bakke
2018-02-12 15:37 ` Hartmut Goebel
2018-02-13 22:48 ` Marius Bakke
2018-02-16 16:18 ` Hartmut Goebel
2018-02-16 16:49 ` Ludovic Courtès
2018-02-16 18:49 ` [bug#30340] " Hartmut Goebel
2018-02-17 16:08 ` Ludovic Courtès
2018-02-17 20:25 ` Leo Famulari
2018-02-16 16:26 ` Hartmut Goebel
2018-02-16 16:36 ` Marius Bakke
2018-02-09 13:43 ` Ludovic Courtès
2018-02-12 15:59 ` Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180203192505.29516-4-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=30340@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).