me
/
guix
Archived
1
0
Fork 0

gnu: imv: Update to 4.1.0 and adjust arguments+inputs.

* gnu/packages/image-viewers.scm (imv): [version]: Update to 4.1.0.
[build-system]: Replace with meson-build-system.
[phases]: Remove (delete 'configure)
[make-flags]: Remove it.
[inputs]: Remove asciidoc. Add libheif, libjpeg-turbo, libinih, libnsgif,
librsvg-next, libtiff
[native-inputs]: Add asciidoc, Add git-minimal

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Z572 2021-09-09 21:36:54 +08:00 committed by Ludovic Courtès
parent 94d2d0b7f8
commit be32889902
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 14 deletions

View File

@ -20,6 +20,7 @@
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2021 jgart <jgart@dismail.de> ;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -80,6 +81,7 @@
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (gnu packages suckless) #:use-module (gnu packages suckless)
#:use-module (gnu packages terminals) #:use-module (gnu packages terminals)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
@ -739,7 +741,7 @@ displayed in a terminal.")
(define-public imv (define-public imv
(package (package
(name "imv") (name "imv")
(version "4.1.0") (version "4.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -747,13 +749,12 @@ displayed in a terminal.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx")) "12xcayyzmfknbff04z8jdlxsnnimgisqiah0bw07cyxx8ksmdzqw"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)
(add-after 'install 'record-absolute-file-names (add-after 'install 'record-absolute-file-names
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'.
@ -763,22 +764,24 @@ displayed in a terminal.")
(substitute* (string-append bin "/imv") (substitute* (string-append bin "/imv")
(("imv-") (("imv-")
(string-append bin "/imv-"))) (string-append bin "/imv-")))
#t)))) #t))))))
#:make-flags
(list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "CONFIGPREFIX="
(assoc-ref %outputs "out") "/etc"))))
(inputs (inputs
`(("asciidoc" ,asciidoc) `(("freeimage" ,freeimage)
("freeimage" ,freeimage)
("glu" ,glu) ("glu" ,glu)
("librsvg" ,librsvg) ("libheif" ,libheif)
("libjpeg-turbo" ,libjpeg-turbo)
("libinih" ,libinih)
("libnsgif" ,libnsgif)
("librsvg" ,librsvg-next)
("libtiff" ,libtiff)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("pango" ,pango) ("pango" ,pango)
("wayland" ,wayland))) ("wayland" ,wayland)))
(native-inputs (native-inputs
`(("cmocka" ,cmocka) `(("asciidoc" ,asciidoc)
("cmocka" ,cmocka)
;; why build need it?
("git" ,git-minimal)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(synopsis "Image viewer for tiling window managers") (synopsis "Image viewer for tiling window managers")
(description "@code{imv} is a command line image viewer intended for use (description "@code{imv} is a command line image viewer intended for use