[bug#40931] [PATCH] gnu: add j4-dmenu-desktop

[bug#40931] [PATCH] gnu: add j4-dmenu-desktop

[Alex McGrath]

---
 gnu/packages/xdisorg.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index bc2c9c4622..02997dcbf1 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
+;;; Copyright © 2020 Alex McGrath <amk@amk.ie>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2286,3 +2287,25 @@ to find all available clips and launches @command{dmenu} (or @command{rofi},
 depending on the value of @code{CM_LAUNCHER}) to let the user select a clip.
 After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.")
       (license license:public-domain))))
+
+(define-public j4-dmenu-desktop
+  (package
+    (name "j4-dmenu-desktop")
+    (version "2.17")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/enkore/j4-dmenu-desktop.git")
+                    (commit (string-append "r" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DWITH_GIT_CACHE=off" "-DWITH_TESTS=off")
+       #:tests? #f)) ;; tests fetch an external git repo
+    (synopsis "A fast desktop menu")
+    (description "j4-dmenu-desktop is a replacement for i3-dmenu-desktop. It's purpose is to find desktop files and offer you a menu to start an application using dmenu.")
+    (home-page "https://github.com/enkore/j4-dmenu-desktop")
+    (license license:gpl3+)))
-- 
2.26.1

[bug#40931] [PATCH v2] gnu: add j4-dmenu-desktop

[Alex McGrath]

* gnu/packages/xdisorg.scm (j4-dmenu-desktop): New variable.

 gnu/packages/xdisorg.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index bc2c9c4622..02997dcbf1 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
 ;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
+;;; Copyright © 2020 Alex McGrath <amk@amk.ie>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2286,3 +2287,25 @@ to find all available clips and launches @command{dmenu} (or @command{rofi},
 depending on the value of @code{CM_LAUNCHER}) to let the user select a clip.
 After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.")
       (license license:public-domain))))
+
+(define-public j4-dmenu-desktop
+  (package
+    (name "j4-dmenu-desktop")
+    (version "2.17")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/enkore/j4-dmenu-desktop.git")
+                    (commit (string-append "r" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DWITH_GIT_CACHE=off" "-DWITH_TESTS=off")
+       #:tests? #f)) ;; tests fetch an external git repo
+    (synopsis "A fast desktop menu")
+    (description "j4-dmenu-desktop is a replacement for i3-dmenu-desktop. It's purpose is to find desktop files and offer you a menu to start an application using dmenu.")
+    (home-page "https://github.com/enkore/j4-dmenu-desktop")
+    (license license:gpl3+)))
-- 
2.26.1

[bug#40931] [PATCH v2] gnu: add j4-dmenu-desktop

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1874 bytes --]

Alex McGrath <amk@amk.ie> writes:

> * gnu/packages/xdisorg.scm (j4-dmenu-desktop): New variable.

Thanks!  Unfortunately the patch no longer applies, can you rebase it on
the current master branch?

[...]

> +(define-public j4-dmenu-desktop
> +  (package
> +    (name "j4-dmenu-desktop")
> +    (version "2.17")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/enkore/j4-dmenu-desktop.git")
> +                    (commit (string-append "r" version))))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +                "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release" "-DWITH_GIT_CACHE=off" "-DWITH_TESTS=off")

Note that cmake-build-system exposes #:build-type, so you don't have to
pass "-DCMAKE_BUILD_TYPE".  By default it uses RelWithDebugInfo which is
better because it adds debug information.  There are cases where we
want "Release" instead (size or performance concerns), but it probably
is fine for this package?

> +       #:tests? #f)) ;; tests fetch an external git repo

Is it possible to provide this repo as a native-input?  See e.g. 'ghc'.
Don't stress it if it's not possible, though.

> +    (synopsis "A fast desktop menu")

Just "Fast desktop menu" ('./pre-inst-env guix lint j4-dmenu-desktop'
should warn about this).

> +    (description "j4-dmenu-desktop is a replacement for i3-dmenu-desktop. It's purpose is to find desktop files and offer you a menu to start an application using dmenu.")

Use two spaces between sentences, and try to wrap lines at ~78
characters.  'guix lint' will warn about this, too.  :-)

Can you send an updated patch?  Thanks in advance!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#40931] [PATCH v2] gnu: add j4-dmenu-desktop

[Alex McGrath]

Howdy,

I think I've addressed the comments (ran guix lint etc) and I enabled all the tests except for one, as it checks for a directory that doesnt exist on guix and fails as a result

Thanks for the review!
Alex

bug#40931: [PATCH v2] gnu: add j4-dmenu-desktop

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

"Alex McGrath" <amk@amk.ie> writes:

> Howdy,
>
> I think I've addressed the comments (ran guix lint etc) and I enabled all the tests except for one, as it checks for a directory that doesnt exist on guix and fails as a result

Excellent, LGTM!

I've applied the patch with minor adjustments (removed redundant
#:tests? #t, and formatted description with @file and @command markup
where appropriate).

Pushed in c65e243463c704698288bad787cd6f5292280bba, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#40931] [PATCH v3] gnu: add j4-dmenu-desktop

[Alex McGrath]

* gnu/packages/xdisorg.scm (j4-dmenu-desktop): New variable.
---
 gnu/packages/xdisorg.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index df61a95cbb..99b3f765d2 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -36,6 +36,7 @@
 ;;; Copyright © 2020 Damien Cassou <damien@cassou.me>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com>
+;;; Copyright © 2020 Alex McGrath <amk@amk.ie>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2324,3 +2325,34 @@ some kind of chat (in native language).
 @command{kbdd} also supports D-Bus signals, which makes it possible to
 create layout indicator widgets.")
     (license license:bsd-2)))
+
+(define-public j4-dmenu-desktop
+  (package
+    (name "j4-dmenu-desktop")
+    (version "2.17")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/enkore/j4-dmenu-desktop.git")
+                    (commit (string-append "r" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("catch2" ,catch-framework2)))
+    (arguments
+     `(#:configure-flags '("-DWITH_GIT_CATCH=off")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             (invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME"))))
+       #:tests? #t))
+    (synopsis "Fast desktop menu")
+    (description  "j4-dmenu-desktop is a replacement for
+i3-dmenu-desktop.  It's purpose is to find desktop files and offer you a menu
+to start an application using dmenu.")
+    (home-page "https://github.com/enkore/j4-dmenu-desktop")
+    (license license:gpl3+)))
-- 
2.26.2