From 93d8523487ee869dc4950fdab06659f6dc919ec2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 13 Aug 2022 16:50:53 +0530 Subject: gnu: kiwix-desktop: Update to 2.2.2. * gnu/packages/web.scm (kiwix-desktop): Update to 2.2.2. [arguments]: Delete enable-print-support and substitute-source phases. Use search-input-file. Do not return #t from phases. [native-inputs]: Remove labels. --- gnu/packages/web.scm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8c7df5af1e..6f506dc490 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8032,7 +8032,7 @@ (define-public kiwix-lib (define-public kiwix-desktop (package (name "kiwix-desktop") - (version "2.0.5") + (version "2.2.2") (source (origin (method url-fetch) (uri (string-append @@ -8041,7 +8041,7 @@ (define-public kiwix-desktop ".tar.gz")) (sha256 (base32 - "1a9h4qmh6fkfscyp6lax0ri07dvvzw2wp4kr1sm86n0bdk3cwwha")))) + "0ani12d91azcwwys499848ws7rx0m7c23nalcm5fanjak76bg6n6")))) (build-system gnu-build-system) (arguments `(#:phases @@ -8051,28 +8051,14 @@ (define-public kiwix-desktop (invoke "qmake" (string-append "PREFIX=" (assoc-ref outputs "out"))))) - (add-before 'configure 'enable-print-support - (lambda _ - (substitute* "kiwix-desktop.pro" - (("webenginewidgets") "webenginewidgets printsupport")) - #t)) - (add-before 'configure 'substitute-source - ;; Looks like .pro file is missing a feature. - ;; See https://github.com/kiwix/kiwix-desktop/issues/556. - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "kiwix-desktop.pro" - (("webenginewidgets" all) (string-append all " printsupport"))) - #t)) (add-after 'install 'wrap-qt-process-path (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/kiwix-desktop")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (qt-process-path (search-input-file + inputs "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) - #t)))))) + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) (inputs (list curl icu4c @@ -8088,8 +8074,8 @@ (define-public kiwix-desktop zlib `(,zstd "lib"))) (native-inputs - `(("pkg-config" ,pkg-config) - ("qmake" ,qtbase-5))) + (list pkg-config + qtbase-5)) (home-page "https://wiki.kiwix.org/wiki/Software") (synopsis "Viewer and manager of ZIM files") (description "Kiwix Desktop allows you to enjoy a lot of different content -- cgit v1.2.3