[bug#51477] [PATCH] gnu: Add nsxiv

[bug#51477] [PATCH] gnu: Add nsxiv

[Foo Chuan Wei]

* gnu/packages/image-viewers.scm (nsxiv): New variable.
---
 gnu/packages/image-viewers.scm | 55 ++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 4f87b63ca1..1799642cbb 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -417,6 +418,60 @@ base should be kept small and clean to make it easy for you to dig into
 it and customize it for your needs.")
     (license license:gpl2+)))
 
+(define-public nsxiv
+  (package
+    (name "nsxiv")
+    (version "27.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nsxiv/nsxiv")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1na7f0hpc9g04nm7991gzaqr5gkj08n2azx833hgxcm2w1pnn1bk"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f                      ; no check target
+       #:make-flags
+       (list (string-append "PREFIX=" %output)
+             (string-append "CC=" ,(cc-for-target)))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)            ; no configure script
+         (add-after 'unpack 'fix-libXft-path
+           (lambda _
+             ;; Xft.h #includes <ft2build.h> without ‘freetype2/’. The Makefile
+             ;; works around this by hard-coding /usr/include & $PREFIX.
+             (substitute* "Makefile"
+               (("-I/usr/include/freetype2 -I\\$\\(PREFIX\\)/include/freetype2")
+                (string-append "-I" (assoc-ref %build-inputs "freetype")
+                               "/include/freetype2")))))
+         (add-after 'install 'install-desktop-file
+           (lambda* (#:key outputs #:allow-other-keys)
+             (install-file "nsxiv.desktop"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/applications"))))
+         (add-after 'install 'install-icons
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (apply invoke "make" "-C" "icon" "install" make-flags))))))
+    (inputs
+     `(("freetype" ,freetype)
+       ("giflib" ,giflib)
+       ("imlib2" ,imlib2)
+       ("libexif" ,libexif)
+       ("libx11" ,libx11)
+       ("libxft" ,libxft)))
+    (home-page "https://github.com/nsxiv/nsxiv")
+    (synopsis "Neo Simple X Image Viewer")
+    (description
+     "nsxiv is a fork of sxiv.  Its primary goal is to provide the most basic
+features required for fast image viewing.  It has vi key bindings and works
+nicely with tiling window managers.  Its code base should be kept small an
+clean to make it easy for you to dig into it and customize it for your needs.")
+    (license license:gpl2+)))
+
 (define-public viewnior
   (package
     (name "viewnior")

base-commit: ad39268cdf075f4c4eeb87ed78ce46ca6f817675
-- 
2.25.1

[bug#51477] [PATCH v2] gnu: Add nsxiv.

[Foo Chuan Wei]

* gnu/packages/image-viewers.scm (nsxiv): New variable.
---
 gnu/packages/image-viewers.scm | 54 ++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 4f87b63ca1..8e34ce1608 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -417,6 +417,60 @@ base should be kept small and clean to make it easy for you to dig into
 it and customize it for your needs.")
     (license license:gpl2+)))
 
+(define-public nsxiv
+  (package
+    (name "nsxiv")
+    (version "27.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nsxiv/nsxiv")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1na7f0hpc9g04nm7991gzaqr5gkj08n2azx833hgxcm2w1pnn1bk"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f                      ; no check target
+       #:make-flags
+       (list (string-append "PREFIX=" %output)
+             (string-append "CC=" ,(cc-for-target)))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)            ; no configure script
+         (add-after 'unpack 'fix-paths
+           (lambda _
+             ;; Xft.h #includes <ft2build.h> without ‘freetype2/’. The Makefile
+             ;; works around this by hard-coding /usr/include & $PREFIX.
+             (substitute* "Makefile"
+               (("-I/usr/include/freetype2 -I\\$\\(PREFIX\\)/include/freetype2")
+                (string-append "-I" (assoc-ref %build-inputs "freetype")
+                               "/include/freetype2")))))
+         (add-after 'install 'install-desktop-file
+           (lambda* (#:key outputs #:allow-other-keys)
+             (install-file "nsxiv.desktop"
+                           (string-append (assoc-ref outputs "out")
+                                          "/share/applications"))))
+         (add-after 'install 'install-icons
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (apply invoke "make" "-C" "icon" "install" make-flags))))))
+    (inputs
+     `(("freetype" ,freetype)
+       ("giflib" ,giflib)
+       ("imlib2" ,imlib2)
+       ("libexif" ,libexif)
+       ("libx11" ,libx11)
+       ("libxft" ,libxft)))
+    (home-page "https://github.com/nsxiv/nsxiv")
+    (synopsis "Neo Simple X Image Viewer")
+    (description
+     "nsxiv is a fork of sxiv. Its primary goal is to provide the most basic
+features required for fast image viewing. It has vi key bindings and works
+nicely with tiling window managers. Its code base should be kept small and
+clean to make it easy for you to dig into it and customize it for your needs.")
+    (license license:gpl2+)))
+
 (define-public viewnior
   (package
     (name "viewnior")

base-commit: 9f2c5e901e988b575d487629976d2d14be4ed61d
-- 
2.25.1

bug#51477: [PATCH v2] gnu: Add nsxiv.

[Nicolas Goaziou]

Hello,

Foo Chuan Wei <chuanwei.foo@hotmail.com> writes:

> * gnu/packages/image-viewers.scm (nsxiv): New variable.

Thank you. Applied with the following changes:

> +         (add-after 'unpack 'fix-paths
> +           (lambda _
> +             ;; Xft.h #includes <ft2build.h> without ‘freetype2/’. The Makefile
> +             ;; works around this by hard-coding /usr/include & $PREFIX.
> +             (substitute* "Makefile"
> +               (("-I/usr/include/freetype2 -I\\$\\(PREFIX\\)/include/freetype2")
> +                (string-append "-I" (assoc-ref %build-inputs "freetype")
> +                               "/include/freetype2")))))

I used the code below instead:

  (lambda* (#:key inputs #:allow-other-keys)
    (let ((freetype (string-append (assoc-ref inputs "freetype")
                                   "/include/freetype2")))
      (substitute* "Makefile"
        (("-I/usr/include/freetype2 -I\\$\\(PREFIX\\)/include/freetype2")
         (string-append "-I" freetype)))))

> +    (description
> +     "nsxiv is a fork of sxiv. Its primary goal is to provide the most basic
> +features required for fast image viewing. It has vi key bindings and works
> +nicely with tiling window managers. Its code base should be kept small and
> +clean to make it easy for you to dig into it and customize it for
> your needs.")

I added two spaces at the end of sentences, per Texinfo syntax.

Regards,
-- 
Nicolas Goaziou