From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH] gnu: Add imgcat. Date: Sun, 29 Jan 2017 21:14:58 +0000 Message-ID: <87sho1d0vh.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> References: <20170119175040.17403-1-contact.ng0@cryptolab.net> <20170119175040.17403-2-contact.ng0@cryptolab.net> <874m0hznax.fsf@openmailbox.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXwn8-0003gW-Pu for guix-devel@gnu.org; Sun, 29 Jan 2017 16:13:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXwn5-00045u-IR for guix-devel@gnu.org; Sun, 29 Jan 2017 16:13:42 -0500 Received: from fragranza.investici.org ([178.175.144.26]:25924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cXwn5-00044X-A4 for guix-devel@gnu.org; Sun, 29 Jan 2017 16:13:39 -0500 In-Reply-To: <874m0hznax.fsf@openmailbox.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Kei Kebreau Cc: guix-devel@gnu.org Kei Kebreau writes: > contact.ng0@cryptolab.net writes: > >> From: ng0 >> >> * gnu/packages/image-viewers.scm (imgcat): New variable. > You mean catimg, yes? >> --- >> gnu/packages/image-viewers.scm | 54 +++++++++++++++++++++++++++++++++= +++++++++ >> 1 file changed, 54 insertions(+) >> >> diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewe= rs.scm >> index bc56041f8..1559e6668 100644 >> --- a/gnu/packages/image-viewers.scm >> +++ b/gnu/packages/image-viewers.scm >> @@ -4,6 +4,7 @@ >> ;;; Copyright =C2=A9 2015, 2016 Alex Kost >> ;;; Copyright =C2=A9 2016 Efraim Flashner >> ;;; Copyright =C2=A9 2017 Alex Griffin >> +;;; Copyright =C2=A9 2017 ng0 >> ;;; >> ;;; This file is part of GNU Guix. >> ;;; >> @@ -25,6 +26,7 @@ >> #:use-module (guix download) >> #:use-module (guix packages) >> #:use-module (guix build-system gnu) >> + #:use-module (guix build-system cmake) >> #:use-module (gnu packages autotools) >> #:use-module (gnu packages base) >> #:use-module (gnu packages curl) >> @@ -33,6 +35,7 @@ >> #:use-module (gnu packages gnome) >> #:use-module (gnu packages gtk) >> #:use-module (gnu packages image) >> + #:use-module (gnu packages imagemagick) >> #:use-module (gnu packages photo) >> #:use-module (gnu packages pkg-config) >> #:use-module (gnu packages xorg)) >> @@ -205,3 +208,54 @@ your images. Among its features are: >> @item Configurable mouse actions >> @end enumerate\n") >> (license license:gpl3+))) >> + >> +(define-public catimg >> + (package >> + (name "catimg") >> + (version "2.2.1") >> + (source >> + (origin >> + (method url-fetch) >> + (uri (string-append "https://github.com/posva/catimg/archive" >> + "/v" version ".tar.gz")) >> + (file-name (string-append name "-" version ".tar.gz")) >> + (sha256 >> + (base32 >> + "14g90zwh2d3s13hgyxypx2vc0rj1g58l6zcxhgc84wsyxfxd6xpb")))) >> + (build-system cmake-build-system) >> + (arguments >> + `(#:tests? #f ; no check target >> + #:phases >> + (modify-phases %standard-phases >> + (replace 'configure >> + (lambda* (#:key inputs #:allow-other-keys) >> + (let* ((magic (assoc-ref %build-inputs "imagemagick")) >> + (convert (string-append magic "/bin/convert"))) >> + (substitute* "catimg" >> + ;; FIME: The message 'The version of convert'(=E2=80= =A6) >> + ;; gets substituted too, we should revert this. > > I'm not sure what to do here, though the message should never appear > when using the officially packaged version of imagemagick that you refe= r > to here. I'm no imagemagick user, so I can't debug the cause of this message. The practical reasons: the application works as intended, despite any error messages. >> + (("convert") convert)) >> + #t))) >> + (replace 'build >> + (lambda _ >> + (zero? (system* "cmake" "-D" >> + (string-append "CMAKE_INSTALL_PREFIX=3D" >> + (assoc-ref %outputs "out"= )) >> + " " ".")) > > The " " string isn't necessary here; system* adds its own spaces betwee= n > its arguments. Ok. >> + (zero? (system* "make")))) >> + (add-before 'install 'install-script >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let* ((out (assoc-ref outputs "out")) >> + (bin (string-append out "/bin"))) >> + (install-file "catimg" bin) >> + (rename-file (string-append bin "/catimg") >> + (string-append bin "/catimg.sh")) >> + #t)))))) >> + (inputs >> + `(("imagemagick" ,imagemagick))) ; For the script version >> + (home-page "https://github.com/posva/catimg") >> + (synopsis "Render images in the terminal") >> + (description >> + "Catimg is a little program that prints images in the terminal. >> +It supports JPEG, PNG and GIF formats.") >> + (license license:expat))) Thanks! --=20 ng0 -- https://www.inventati.org/patternsinthechaos/