From 4dda2e36a0039a36aa138715930f5201528c5c08 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 30 Dec 2022 23:38:04 +0100 Subject: [PATCH] gnu: openshot: Build with QtWebEngine instead of QtWebKit. * gnu/packages/video.scm (openshot)[inputs]: Change from PYTHON-PYQT to PYTHON-PYQT-WITHOUT-QTWEBKIT. Add PYTHON-PYQTWEBENGINE and QTWEBENGINE-5. [arguments]: Wrap with QTWEBENGINEPROCESS_PATH. --- gnu/packages/video.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2a70c4496f..b9c8ab1ef3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4834,10 +4834,12 @@ (define-public openshot font-dejavu libopenshot python - python-pyqt + python-pyqt-without-qtwebkit + python-pyqtwebengine python-pyzmq python-requests - qtsvg-5)) + qtsvg-5 + qtwebengine-5)) (arguments `(#:modules ((guix build python-build-system) (guix build qt-utils) @@ -4867,10 +4869,16 @@ (define-public openshot #t)) (add-after 'install 'wrap-program (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out")) + (qtwebengine-process-path + (search-input-file + inputs "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-qt-program "openshot-qt" - #:output out #:inputs inputs)) - #t))))) + #:output out #:inputs inputs) + ;; Help the program discover QtWebEngine at runtime. + (wrap-program (string-append out "/bin/openshot-qt") + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengine-process-path))))))))) (home-page "https://www.openshot.org/") (synopsis "Video editor") (description "OpenShot takes your videos, photos, and music files and