diff options
| author | Z572 <873216071@qq.com> | 2021-09-09 21:36:54 +0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-21 15:15:52 +0200 |
| commit | be32889902abc29c14f3ea9a4f52da1bf9a0383a (patch) | |
| tree | c181a903b18ebbd8fdffd8d106921c31db81849d | |
| parent | 94d2d0b7f861803c6670252253e97b266de5514b (diff) | |
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>
| -rw-r--r-- | gnu/packages/image-viewers.scm | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 3b45c25e210..80987a174c0 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> | 20 | ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> |
| 21 | ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> | 21 | ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> |
| 22 | ;;; Copyright © 2021 jgart <jgart@dismail.de> | 22 | ;;; Copyright © 2021 jgart <jgart@dismail.de> |
| 23 | ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> | ||
| 23 | ;;; | 24 | ;;; |
| 24 | ;;; This file is part of GNU Guix. | 25 | ;;; This file is part of GNU Guix. |
| 25 | ;;; | 26 | ;;; |
| @@ -80,6 +81,7 @@ | |||
| 80 | #:use-module (gnu packages qt) | 81 | #:use-module (gnu packages qt) |
| 81 | #:use-module (gnu packages suckless) | 82 | #:use-module (gnu packages suckless) |
| 82 | #:use-module (gnu packages terminals) | 83 | #:use-module (gnu packages terminals) |
| 84 | #:use-module (gnu packages version-control) | ||
| 83 | #:use-module (gnu packages video) | 85 | #:use-module (gnu packages video) |
| 84 | #:use-module (gnu packages web) | 86 | #:use-module (gnu packages web) |
| 85 | #:use-module (gnu packages xdisorg) | 87 | #:use-module (gnu packages xdisorg) |
| @@ -739,7 +741,7 @@ displayed in a terminal.") | |||
| 739 | (define-public imv | 741 | (define-public imv |
| 740 | (package | 742 | (package |
| 741 | (name "imv") | 743 | (name "imv") |
| 742 | (version "4.1.0") | 744 | (version "4.3.0") |
| 743 | (source (origin | 745 | (source (origin |
| 744 | (method git-fetch) | 746 | (method git-fetch) |
| 745 | (uri (git-reference | 747 | (uri (git-reference |
| @@ -747,13 +749,12 @@ displayed in a terminal.") | |||
| 747 | (commit (string-append "v" version)))) | 749 | (commit (string-append "v" version)))) |
| 748 | (sha256 | 750 | (sha256 |
| 749 | (base32 | 751 | (base32 |
| 750 | "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx")) | 752 | "12xcayyzmfknbff04z8jdlxsnnimgisqiah0bw07cyxx8ksmdzqw")) |
| 751 | (file-name (git-file-name name version)))) | 753 | (file-name (git-file-name name version)))) |
| 752 | (build-system gnu-build-system) | 754 | (build-system meson-build-system) |
| 753 | (arguments | 755 | (arguments |
| 754 | `(#:phases | 756 | `(#:phases |
| 755 | (modify-phases %standard-phases | 757 | (modify-phases %standard-phases |
| 756 | (delete 'configure) | ||
| 757 | (add-after 'install 'record-absolute-file-names | 758 | (add-after 'install 'record-absolute-file-names |
| 758 | (lambda* (#:key outputs #:allow-other-keys) | 759 | (lambda* (#:key outputs #:allow-other-keys) |
| 759 | ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. | 760 | ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. |
| @@ -763,22 +764,24 @@ displayed in a terminal.") | |||
| 763 | (substitute* (string-append bin "/imv") | 764 | (substitute* (string-append bin "/imv") |
| 764 | (("imv-") | 765 | (("imv-") |
| 765 | (string-append bin "/imv-"))) | 766 | (string-append bin "/imv-"))) |
| 766 | #t)))) | 767 | #t)))))) |
| 767 | #:make-flags | ||
| 768 | (list ,(string-append "CC=" (cc-for-target)) | ||
| 769 | (string-append "PREFIX=" (assoc-ref %outputs "out")) | ||
| 770 | (string-append "CONFIGPREFIX=" | ||
| 771 | (assoc-ref %outputs "out") "/etc")))) | ||
| 772 | (inputs | 768 | (inputs |
| 773 | `(("asciidoc" ,asciidoc) | 769 | `(("freeimage" ,freeimage) |
| 774 | ("freeimage" ,freeimage) | ||
| 775 | ("glu" ,glu) | 770 | ("glu" ,glu) |
| 776 | ("librsvg" ,librsvg) | 771 | ("libheif" ,libheif) |
| 772 | ("libjpeg-turbo" ,libjpeg-turbo) | ||
| 773 | ("libinih" ,libinih) | ||
| 774 | ("libnsgif" ,libnsgif) | ||
| 775 | ("librsvg" ,librsvg-next) | ||
| 776 | ("libtiff" ,libtiff) | ||
| 777 | ("libxkbcommon" ,libxkbcommon) | 777 | ("libxkbcommon" ,libxkbcommon) |
| 778 | ("pango" ,pango) | 778 | ("pango" ,pango) |
| 779 | ("wayland" ,wayland))) | 779 | ("wayland" ,wayland))) |
| 780 | (native-inputs | 780 | (native-inputs |
| 781 | `(("cmocka" ,cmocka) | 781 | `(("asciidoc" ,asciidoc) |
| 782 | ("cmocka" ,cmocka) | ||
| 783 | ;; why build need it? | ||
| 784 | ("git" ,git-minimal) | ||
| 782 | ("pkg-config" ,pkg-config))) | 785 | ("pkg-config" ,pkg-config))) |
| 783 | (synopsis "Image viewer for tiling window managers") | 786 | (synopsis "Image viewer for tiling window managers") |
| 784 | (description "@code{imv} is a command line image viewer intended for use | 787 | (description "@code{imv} is a command line image viewer intended for use |
