diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-27 16:09:50 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 15:11:41 -0400 |
| commit | 2e3c732141b4e9a9d6003f8124cad51e9bb85847 (patch) | |
| tree | 42170c2cb80421537544259b110a4bb9b96809b6 | |
| parent | b7f1104f0f14cf9f187cc8e8b05224d34914380b (diff) | |
| download | guix-2e3c732141b4e9a9d6003f8124cad51e9bb85847.tar.gz | |
gnu: qtserialport: Update to 5.15.8.
* gnu/packages/qt.scm (qtserialport): Update to 5.15.8. [arguments]: Use gexps. Simplify pattern in patch-dlopen-paths.
| -rw-r--r-- | gnu/packages/qt.scm | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 80317ef5ec..596a7a86d3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1708,30 +1708,32 @@ compositor libraries.") (license (package-license qtbase)))) (define-public qtserialport - (package (inherit qtsvg-5) + (package + (inherit qtsvg-5) (name "qtserialport") - (version "5.15.5") + (version "5.15.8") (source (origin - (method url-fetch) - (uri (qt-urls name version)) - (sha256 - (base32 - "0xg2djwhrj5jqamawlp75g70nmwbp2ph2hh1pm45s36jkxm0k7al")))) + (method url-fetch) + (uri (qt-urls name version)) + (sha256 + (base32 + "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v")))) (native-inputs (list perl)) - (inputs - (list qtbase-5 eudev)) + (inputs (list qtbase-5 eudev)) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) ((#: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 paths for dynamically loaded libs, - ;; otherwise the lib will be searched in LD_LIBRARY_PATH which - ;; typically is not set in guix. - (("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b) - (string-append a (assoc-ref inputs "eudev") "/lib/lib" b))))))))) + #~(modify-phases #$phases + (add-after 'unpack 'patch-dlopen-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/serialport/qtudev_p.h" + ;; Use the absolute paths for dynamically loaded libs, + ;; otherwise the lib will be searched in LD_LIBRARY_PATH which + ;; typically is not set in guix. + (("setFileNameAndVersion\\(QStringLiteral\\(\"udev\")") + (format #f "setFileNameAndVersion(QStringLiteral(~s))" + (string-append #$(this-package-input "eudev") + "/lib/libudev")))))))))) (synopsis "Qt Serial Port module") (description "The Qt Serial Port module provides the library for interacting with serial ports from within Qt."))) |