From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ei3Ru-0001HW-2P for guix-patches@gnu.org; Sat, 03 Feb 2018 14:26:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ei3Rt-0001fH-9E for guix-patches@gnu.org; Sat, 03 Feb 2018 14:26:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48044) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ei3Rt-0001ez-4a for guix-patches@gnu.org; Sat, 03 Feb 2018 14:26:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ei3Rr-0001WA-JN for guix-patches@gnu.org; Sat, 03 Feb 2018 14:26:04 -0500 Subject: [bug#30340] [PATCH 4/6] gnu: qtserialport: Use the store paths for dynamically loaded libs. Resent-Message-ID: From: Hartmut Goebel Date: Sat, 3 Feb 2018 20:25:03 +0100 Message-Id: <20180203192505.29516-4-h.goebel@crazy-compilers.com> In-Reply-To: <20180203192505.29516-1-h.goebel@crazy-compilers.com> References: <20180203192505.29516-1-h.goebel@crazy-compilers.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30340@debbugs.gnu.org Adobt the NixOS patches as of 2018-01-19 for qtserialport. * gnu/packages/qt.scm(qtserialport)[#:phases]: 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