From 7c3df13f220157d2f432a9daf2a168eb954cbbef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 7 Aug 2023 16:42:24 -0400 Subject: gnu: qtbase: Fix qmake link directives. * gnu/packages/qt.scm (qtbase) [origin]: Add patch, specifying patches explicitly. [arguments] : Augment LIBRARY_PATH in check phase. * gnu/packages/patches/qtbase-qmake-use-libname.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/packages/qt.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e8654eee44..cecd6d13a1 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -609,7 +609,11 @@ (define-public qtbase ;; are required by some internal bootstrap target ;; used for the tools. (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "sqlite" "xcb" "zlib")))))) + "libpng" "libjpeg" "sqlite" "xcb" "zlib")))) + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-moc-ignore-gcc-macro.patch" + "qtbase-absolute-runpath.patch" + "qtbase-qmake-use-libname.patch")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) @@ -716,6 +720,11 @@ (define-public qtbase (string-append #$output ":" (getenv "CMAKE_PREFIX_PATH"))) (setenv "QMAKEPATH" (string-append #$output "/lib/qt6")) + ;; It is necessary to augment LIBRARY_PATH with that of the + ;; freshly installed qtbase because of the + ;; 'qtbase-qmake-use-libname.patch' patch. + (setenv "LIBRARY_PATH" (string-append #$output "/lib:" + (getenv "LIBRARY_PATH"))) (setenv "QML2_IMPORT_PATH" (string-append #$output "/lib/qt6/qml")) (setenv "QT_PLUGIN_PATH" -- cgit v1.2.3