diff options
| -rw-r--r-- | gnu/packages/qt.scm | 22 | ||||
| -rw-r--r-- | guix/build/qt-utils.scm | 6 |
2 files changed, 9 insertions, 19 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5e63305c9a..ba894fb1c7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3477,7 +3477,10 @@ linux/libcurl_wrapper.h") "/share/qt5/translations\")")) (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)") (string-append "QLatin1String(\"" #$output - "/share/qt5\")"))) + "/share/qt5\")")) + (("QLibraryInfo::location\\(QLibraryInfo::LibraryExecutablesPath)") + (string-append "QLatin1String(\"" #$output + "/lib/qt5/libexec\")"))) ;; Substitute full dynamic library path for nss. (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" (("libnssckbi.so") @@ -3515,12 +3518,6 @@ linux/libcurl_wrapper.h") ;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH ;; before running tests. ((#:tests? _ #f) #f))) - (native-search-paths - (list (search-path-specification - (file-type 'regular) - (separator #f) - (variable "QTWEBENGINEPROCESS_PATH") - (files '("lib/qt5/libexec/QtWebEngineProcess"))))) (home-page "https://wiki.qt.io/QtWebEngine") (synopsis "Qt WebEngine module") (description "The Qt5WebEngine module provides support for web applications @@ -3886,7 +3883,10 @@ linux/libcurl_wrapper.h" "/share/qt6/translations\")")) (("QLibraryInfo::path\\(QLibraryInfo::DataPath)") (string-append "QLatin1String(\"" #$output - "/share/qt6\")"))) + "/share/qt6\")")) + (("QLibraryInfo::path\\(QLibraryInfo::LibraryExecutablesPath)") + (string-append "QLatin1String(\"" #$output + "/lib/qt6/libexec\")"))) ;; Substitute full dynamic library path for nss. (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" (("libnssckbi.so") @@ -3946,12 +3946,6 @@ linux/libcurl_wrapper.h" (replace "qtbase" qtbase) (replace "qtdeclarative" qtdeclarative) (replace "qtwebchannel" qtwebchannel))) - (native-search-paths - (list (search-path-specification - (file-type 'regular) - (separator #f) - (variable "QTWEBENGINEPROCESS_PATH") - (files '("lib/qt6/libexec/QtWebEngineProcess"))))) (home-page "https://wiki.qt.io/QtWebEngine") (synopsis "Qt WebEngine module") (description "The Qt WebEngine module provides support for web diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index d7609b9f21..65592757e6 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -93,11 +93,7 @@ `(,(if (>= (string->number qt-major-version) 6) "QML_IMPORT_PATH" "QML2_IMPORT_PATH") - prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version)) - ;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the - ;; most suitable environment variable type for it. - `("QTWEBENGINEPROCESS_PATH" = regular - ,(format #f "/lib/qt~a/libexec/QtWebEngineProcess" qt-major-version))))) + prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version))))) (define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs |