nongnu: playonlinux: Revise package style.

* nongnu/packages/playonlinux.scm (playonlinux) [arguments]: Use G-expressions.
Remove trailing #t.

1 files changed, 50 insertions, 53 deletions

diff --git a/nongnu/packages/playonlinux.scm b/nongnu/packages/playonlinux.scm
index c3a587a..9d10102 100644
--- a/nongnu/packages/playonlinux.scm
+++ b/nongnu/packages/playonlinux.scm
@@ -3,6 +3,7 @@
 
 (define-module (nongnu packages playonlinux)
   #:use-module ((guix licenses) :prefix license:)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix build-system pyproject)
   #:use-module (guix git-download)
@@ -34,56 +35,54 @@
                 "0jw43fmc298gb7ga2aldcdyrwlhki5k6hc198pl5x987x4gxfg2h"))))
     (build-system pyproject-build-system)
     (arguments
-     `(#:python ,python-2
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'hardcode-paths
-           (lambda _
-             ;; Do not search for python, call it from its store path
-             (substitute* "bash/find_python"
-               (("POL_PYTHON=\"\"")
-                (string-append "POL_PYTHON=\"" (which "python") "\"")))
-             ;; Do the same for other tools
-             (substitute* "python/lib/dpiFetcher.py"
-               (("xrdb") (which "xrdb")))
-             (substitute* "lib/setupwindow.lib"
-               (("nc") (which "nc")))
-             (substitute* "python/lib/Variables.py"
-               (("curl") (which "curl"))
-               (("wget ") (string-append (which "wget") " ")))
-             (substitute* "lib/scripts.lib"
-               (("\twget") (string-append "\t" (which "wget")))
-               (("\tcabextract") (string-append "\t" (which "cabextract")))
-               (("\tconvert") (string-append "\t" (which "convert"))))
-             (substitute* "lib/playonlinux.lib"
-               (("convert") (which "convert"))
-               (("gpg ") (string-append (which "gpg") " ")))
-             (substitute* "bash/polconfigurator"
-               (("convert") (which "convert")))
-             ;; Also substitute a non essential tool, that is still
-             ;; needed to parse recipes
-             (substitute* "lib/wine.lib"
-               (("jq") (which "jq")))
-             ;; Do not warn if we can't find the tools, since they are
-             ;; called directly with their store path now.
-             (substitute* "python/mainwindow.py"
-               ((".*self.singleCheckFatal.*") "")
-               ((".*self.singleCheck\\(\"jq\", package=\"jq\"\\).*") ""))
-             #t))
-         (replace 'build
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "make" (string-append "PREFIX=" (assoc-ref outputs "out")))))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "make" "install" (string-append "PREFIX=" (assoc-ref outputs "out")))))
-         (add-after 'install 'symlink-locales
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (mkdir-p (string-append out "/share/playonlinux/lang"))
-               (symlink (string-append out "/share/locale")
-                        (string-append out "/share/playonlinux/lang/locale")))
-             #t)))))
+     (list
+      #:python python-2
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'hardcode-paths
+            (lambda _
+              ;; Do not search for python, call it from its store path
+              (substitute* "bash/find_python"
+                (("POL_PYTHON=\"\"")
+                 (string-append "POL_PYTHON=\"" (which "python") "\"")))
+              ;; Do the same for other tools
+              (substitute* "python/lib/dpiFetcher.py"
+                (("xrdb") (which "xrdb")))
+              (substitute* "lib/setupwindow.lib"
+                (("nc") (which "nc")))
+              (substitute* "python/lib/Variables.py"
+                (("curl") (which "curl"))
+                (("wget ") (string-append (which "wget") " ")))
+              (substitute* "lib/scripts.lib"
+                (("\twget") (string-append "\t" (which "wget")))
+                (("\tcabextract") (string-append "\t" (which "cabextract")))
+                (("\tconvert") (string-append "\t" (which "convert"))))
+              (substitute* "lib/playonlinux.lib"
+                (("convert") (which "convert"))
+                (("gpg ") (string-append (which "gpg") " ")))
+              (substitute* "bash/polconfigurator"
+                (("convert") (which "convert")))
+              ;; Also substitute a non essential tool, that is still
+              ;; needed to parse recipes
+              (substitute* "lib/wine.lib"
+                (("jq") (which "jq")))
+              ;; Do not warn if we can't find the tools, since they are
+              ;; called directly with their store path now.
+              (substitute* "python/mainwindow.py"
+                ((".*self.singleCheckFatal.*") "")
+                ((".*self.singleCheck\\(\"jq\", package=\"jq\"\\).*") ""))))
+          (replace 'build
+            (lambda _
+              (invoke "make" (string-append "PREFIX=" #$output))))
+          (replace 'install
+            (lambda _
+              (invoke "make" "install" (string-append "PREFIX=" #$output))))
+          (add-after 'install 'symlink-locales
+            (lambda _
+              (mkdir-p (string-append #$output "/share/playonlinux/lang"))
+              (symlink (string-append #$output "/share/locale")
+                       (string-append #$output "/share/playonlinux/lang/locale")))))))
     (inputs
      (list cabextract
            curl
@@ -104,6 +103,4 @@ install and use numerous games and apps designed to run with Microsoft
 Windows.  Few games are compatible with GNU/Linux at the moment and it
 certainly is a factor preventing the migration to this system.  PlayOnLinux
 brings a cost-free, accessible and efficient solution to this problem.")
-    (license (list
-               license:gpl2+
-               license:gpl3+))))
+    (license (list license:gpl2+ license:gpl3+))))