diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-08 09:41:45 -0500 |
| commit | d88cee1d44a475b6ea276e87a4c98682255b881e (patch) | |
| tree | f2e681b5211840d4eef688120041c2dd730002cc /gnu/packages/image-viewers.scm | |
| parent | d2b9b4b861b71d11eaeaa12fe544c9ffb0b6644d (diff) | |
| parent | 20059f92a97726b40d4d74e67463a64c98d1da0d (diff) | |
| download | guix-d88cee1d44a475b6ea276e87a4c98682255b881e.tar.gz | |
Merge branch 'master' into staging.
With conflicts resolved in: gnu/packages/version-control.scm
Diffstat (limited to 'gnu/packages/image-viewers.scm')
| -rw-r--r-- | gnu/packages/image-viewers.scm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 200b8c1cc3..1879b9949c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -750,7 +750,7 @@ displayed in a terminal.") (define-public imv (package (name "imv") - (version "4.3.1") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -758,21 +758,21 @@ displayed in a terminal.") (commit (string-append "v" version)))) (sha256 (base32 - "01x6qg7nhikqh68gnzrdvq0rxma5v9z19il89y8bvdrcr7r1vh40")) + "1zlds43z17jrnsrfz3rf3sb3pa5gkmxaibq87509ikc7p1p09c9c")) (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'record-absolute-file-names - (lambda* (#:key outputs #:allow-other-keys) - ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. - ;; Record their absolute file name. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (substitute* (string-append bin "/imv") - (("imv-") - (string-append bin "/imv-"))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'record-absolute-file-names + (lambda _ + ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. + ;; 'imv-dir' execs 'imv'. Record their absolute file names. + (let ((bin (string-append #$output "/bin"))) + (substitute* (string-append bin "/imv") + (("imv-") (string-append bin "/imv-"))) + (substitute* (string-append bin "/imv-dir") + (("imv") (string-append bin "/imv"))))))))) (native-inputs (list asciidoc pkg-config)) |