Subject: [bug#69277] [PATCH 2/2] gnu: nicotine+: Use g-expressions.

From: Juliana Sims <[email-masked]>
Date: Mon, 19 Feb 2024 13:05:29 -0500

* gnu/packages/nicotine.scm (nicotine+): Use g-expressions, lint, style.

Change-Id: If51864440781825dddc7745a88c6efec02ed8e30
---
 gnu/packages/nicotine.scm | 81 +++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm
index 3c8a384659..5a96a76e47 100644
--- a/gnu/packages/nicotine.scm
+++ b/gnu/packages/nicotine.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Martin Becze <[email-masked]>
 ;;; Copyright © 2022 Fatima Toothpaste <[email-masked]>
+;;; Copyright © 2024 Juliana Sims <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,6 +21,7 @@
 (define-module (gnu packages nicotine)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix build-system python)
   #:use-module (gnu packages bash)
@@ -35,46 +37,51 @@ (define-public nicotine+
   (package
     (name "nicotine+")
     (version "3.3.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/Nicotine-Plus/nicotine-plus")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256 (base32 "1qzc8k2pkw4sgb4p1qrd9d71j8m5v834v0df5qvdfwgnmsn4dnzj"))
-              (modules '((guix build utils)))
-              ;; Remove test that relies on network access.
-              (snippet '(delete-file-recursively "pynicotine/tests/unit/test_version.py"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Nicotine-Plus/nicotine-plus")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qzc8k2pkw4sgb4p1qrd9d71j8m5v834v0df5qvdfwgnmsn4dnzj"))
+       (modules '((guix build utils)))
+       ;; Remove test that relies on network access.
+       (snippet '(delete-file-recursively
+                  "pynicotine/tests/unit/test_version.py"))))
     (build-system python-build-system)
     (arguments
-     `(#:imported-modules ((guix build glib-or-gtk-build-system)
+     (list
+      #:imported-modules `((guix build glib-or-gtk-build-system)
                            ,@%python-build-system-modules)
-       #:modules
-       ((guix build utils)
-        (guix build python-build-system)
-        ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-program
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((prog (string-append
-                          (assoc-ref outputs "out")
-                          "/bin/nicotine"))
-                   (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
-               (wrap-program prog
-                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))
-         (add-after 'wrap-program 'glib-or-gtk-wrap
-           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
-         (add-after 'glib-or-gtk-wrap 'glib-or-gtk-compile-schemas
-           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "xvfb-run" "python" "-m" "unittest")))))))
-    (inputs
-     (list bash-minimal gspell gtk+ python-pygobject libappindicator python-pytaglib))
-    (native-inputs
-     (list gettext-minimal xvfb-run))
+      #:modules `((guix build utils)
+                  (guix build python-build-system)
+                  ((guix build glib-or-gtk-build-system)
+                   #:prefix glib-or-gtk:))
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'install 'wrap-program
+                     (lambda _
+                       (wrap-program (string-append #$output "/bin/nicotine")
+                         `("GI_TYPELIB_PATH" ":" prefix
+                           (,(getenv "GI_TYPELIB_PATH"))))))
+                   (add-after 'wrap-program 'glib-or-gtk-wrap
+                     (assoc-ref glib-or-gtk:%standard-phases
+                                'glib-or-gtk-wrap))
+                   (add-after 'glib-or-gtk-wrap 'glib-or-gtk-compile-schemas
+                     (assoc-ref glib-or-gtk:%standard-phases
+                                'glib-or-gtk-compile-schemas))
+                   (replace 'check
+                     (lambda* (#:key tests? #:allow-other-keys)
+                       (when tests?
+                         (invoke "xvfb-run" "python" "-m" "unittest")))))))
+    (inputs (list bash-minimal
+                  gspell
+                  gtk+
+                  python-pygobject
+                  libappindicator
+                  python-pytaglib))
+    (native-inputs (list gettext-minimal xvfb-run))
     (home-page "https://nicotine-plus.org/")
     (synopsis "Graphical client for Soulseek")
     (description
-- 
2.41.0