ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: kiwix-lib: Update to 11.0.0.

Browse source 
* gnu/packages/web.scm (kiwix-lib): Update to 11.0.0.
[arguments]: Do not explicitly pass mustache path to CPPFLAGS. Do not return
#t from phases. Use search-input-file.
[native-inputs]: Remove labels. Use cpp-mustache package instead of its
source.
This commit is contained in:
Arun Isaac 2022-08-13 16:47:31 +05:30
parent 1e51cb37fb
commit ff564de64c
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/web.scm
View file

@ -109,6 +109,7 @@ (define-module (gnu packages web)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages crates-gtk) #:use-module (gnu packages crates-gtk)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
@ -7986,7 +7987,7 @@ (define-public libzim
(define-public kiwix-lib (define-public kiwix-lib
(package (package
(name "kiwix-lib") (name "kiwix-lib")
(version "9.4.1") (version "11.0.0")
(home-page "https://github.com/kiwix/kiwix-lib/") (home-page "https://github.com/kiwix/kiwix-lib/")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -7995,7 +7996,7 @@ (define-public kiwix-lib
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"034nk6l623v78clrs2d0k1vg69sbzrd8c0q79qiqmlkinck1nkxw")) "1w5dabzvd3cnhw064qf9166476fszkkxjcml21x35av0dcd1vlk6"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
@ -8003,13 +8004,11 @@ (define-public kiwix-lib
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-paths-and-includes (add-before 'configure 'fix-paths-and-includes
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPPFLAGS" (string-append "-I" (assoc-ref inputs "mustache")))
(substitute* "src/aria2.cpp" (substitute* "src/aria2.cpp"
(("ARIA2_CMD \"aria2c\"") (("ARIA2_CMD \"aria2c\"")
(string-append "ARIA2_CMD \"" (string-append "ARIA2_CMD \""
(assoc-ref inputs "aria2") (search-input-file inputs "/bin/aria2c")
"/bin/aria2c\""))) "\""))))))))
#t)))))
(inputs (inputs
(list aria2 (list aria2
curl curl
@ -8021,19 +8020,10 @@ (define-public kiwix-lib
zlib zlib
`(,zstd "lib"))) `(,zstd "lib")))
(native-inputs (native-inputs
`(("mustache" ,(origin (list cpp-mustache
(method git-fetch) pkg-config
(uri (git-reference ;; for kiwix-compile-resources
(url "https://github.com/kainjow/Mustache") python-wrapper))
;; XXX: Readme says to use version 3. Can we use 3.2.1?
(commit "v4.1")))
(file-name (git-file-name "mustache" "4.1"))
(sha256
(base32
"0r9rbk6v1wpld2ismfsk2lkhbyv3dkf0p03hkjivbj05qkfhvlbb"))))
("pkg-config" ,pkg-config)
;; for kiwix-compile-resources
("python" ,python-wrapper)))
(synopsis "Common code base for all Kiwix ports") (synopsis "Common code base for all Kiwix ports")
(description "The Kiwix library provides the Kiwix software suite core. (description "The Kiwix library provides the Kiwix software suite core.
It contains the code shared by all Kiwix ports.") It contains the code shared by all Kiwix ports.")