nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: catimg: Update to 2.2.2. 

* gnu/packages/image-viewers.scm (catimg): Update to 2.2.2.
[arguments]: Add ‘-DMAN_OUTPUT_PATH’ to the cmake arguments.
This commit is contained in:
Tobias Geerinckx-Rice 2017-03-03 02:04:06 +01:00
parent 0f9bb61bfa
commit 1e5c056ca1
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/image-viewers.scm
View File

@ -212,7 +212,7 @@ your images. Among its features are:
(define-public catimg (define-public catimg
(package (package
(name "catimg") (name "catimg")
(version "2.2.1") (version "2.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -221,10 +221,10 @@ your images. Among its features are:
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"14g90zwh2d3s13hgyxypx2vc0rj1g58l6zcxhgc84wsyxfxd6xpb")))) "1abkhrhw4r221lwn2vb8in3vmp6gxn3qlv34cqndr55v5gdpb9qz"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; No check target `(#:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -234,20 +234,22 @@ your images. Among its features are:
(substitute* "catimg" (substitute* "catimg"
;; By replacing "convert", we also replace the "convert" ;; By replacing "convert", we also replace the "convert"
;; in the message 'The version of convert is too old, don't ;; in the message 'The version of convert is too old, don't
;; expect good results :('. This should not happen, but in ;; expect good results :('. This should not happen, but in
;; practice this error message should not affect us. ;; practice this error message should not affect us.
(("convert") convert)) (("convert") convert))
#t))) #t)))
(replace 'build (replace 'build
(lambda _ (lambda _
(zero? (system* "cmake" "-D" (let* ((out (assoc-ref %outputs "out"))
(string-append "CMAKE_INSTALL_PREFIX=" (man (string-append out "/share/man/man1")))
(assoc-ref %outputs "out")) (zero? (system* "cmake"
".")) (string-append "-DCMAKE_INSTALL_PREFIX=" out)
(zero? (system* "make")))) (string-append "-DMAN_OUTPUT_PATH=" man)
"."))
(zero? (system* "make")))))
(add-before 'install 'install-script (add-before 'install 'install-script
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; The bashscript lacks an file extension, we have to rename ;; The bash script lacks an file extension. We have to rename
;; it so that the C program and the bash script can be happy ;; it so that the C program and the bash script can be happy
;; side by side. ;; side by side.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -257,7 +259,7 @@ your images. Among its features are:
(string-append bin "/catimg.sh")) (string-append bin "/catimg.sh"))
#t)))))) #t))))))
(inputs (inputs
`(("imagemagick" ,imagemagick))) ; For the bash script version `(("imagemagick" ,imagemagick))) ; for the bash script version
(home-page "https://github.com/posva/catimg") (home-page "https://github.com/posva/catimg")
(synopsis "Render images in the terminal") (synopsis "Render images in the terminal")
(description (description