gnu: xdg-desktop-portal-wlr: Cleanup and style.

* gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): Cleanup and run guix
style.

Change-Id: I2ac138281b8be351000f0beabd2efb1d0cdcb29f
Signed-off-by: Noé Lopez <noelopez@free.fr>

gnu/packages/freedesktop.scm

@@ -3418,49 +3418,49 @@ interfaces.")
   (package
     (name "xdg-desktop-portal-wlr")
     (version "0.8.2")
-    (source (origin
+    (source
-              (method git-fetch)
+     (origin
-              (uri (git-reference
+       (method git-fetch)
-                     (url "https://github.com/emersion/xdg-desktop-portal-wlr")
+       (uri (git-reference
-                     (commit (string-append "v" version))))
+             (url "https://github.com/emersion/xdg-desktop-portal-wlr")
-              (file-name (git-file-name name version))
+             (commit (string-append "v" version))))
-              (sha256
+       (file-name (git-file-name name version))
-               (base32
+       (sha256
-                "1jj0a9s3h3i04qsxkhcpxjzbb17hs9ngdy7wkypja09233zdz10w"))
+        (base32 "1jj0a9s3h3i04qsxkhcpxjzbb17hs9ngdy7wkypja09233zdz10w"))
-              (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
+       (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags
+     (list
-       '("-Dsystemd=disabled"
+      #:configure-flags
-         "-Dsd-bus-provider=libelogind")
+      #~(list "-Dsystemd=disabled"
-       #:phases
+              "-Dsd-bus-provider=libelogind")
-       (modify-phases %standard-phases
+      #:phases
-         (add-after 'unpack 'hardcode-binaries
+      #~(modify-phases %standard-phases
-           (lambda* (#:key inputs #:allow-other-keys)
+          (add-after 'unpack 'hardcode-binaries
-             (let ((sh (search-input-file inputs "/bin/sh"))
+            (lambda* (#:key inputs #:allow-other-keys)
-                   (grim (search-input-file inputs "/bin/grim"))
+              (let ((sh (search-input-file inputs "/bin/sh"))
-                   (slurp (search-input-file inputs "/bin/slurp")))
+                    (grim (search-input-file inputs "/bin/grim"))
-               (substitute* "src/screenshot/screenshot.c"
+                    (slurp (search-input-file inputs "/bin/slurp")))
-                 (("grim") grim)
+                (substitute* '("src/screencast/chooser.c"
-                 (("slurp") slurp)
+                               "src/screenshot/screenshot.c")
-                 (("execl\\(\"/bin/sh\", \"/bin/sh\"")
+                  (("grim") grim)
-                  (string-append "execl(\"" sh "\", \"" sh "\"")))
+                  (("slurp") slurp)
-               (substitute* "src/screencast/screencast.c"
+                  (("/bin/sh") sh))
-                 (("execvp\\(\"sh")
+                (substitute* "src/screencast/screencast.c"
-                  (string-append "execvp(\"" sh))))))
+                  (("execvp\\(\"sh")
-         (add-after 'install 'install-documentation
+                   (format #f "execvp(\"~a" sh))))))
-           (lambda* (#:key outputs #:allow-other-keys)
+          (add-after 'install 'install-documentation
-             (install-file "../source/README.md"
+            (lambda _
-                           (string-append (assoc-ref outputs "out")
+              (install-file "../source/README.md"
-                                          "/share/doc/" ,name)))))))
+                            (string-append #$output "/share/doc/"
-    (native-inputs
+                                           #$name)))))))
-     (list cmake-minimal pkg-config scdoc))
+    (native-inputs (list cmake-minimal pkg-config scdoc))
-    (inputs (list elogind
+    (inputs (list bash-minimal
-                  bash-minimal
+                  elogind
                   grim
                   iniparser
-                  mesa
                   libinih
+                  mesa
                   pipewire
                   slurp
                   wayland

gnu/packages/lisp-xyz.scm

@@ -22847,16 +22847,6 @@ specification}, a toolkit for writing GUIs in Common Lisp.")
 (define-public cl-mcclim
   (sbcl-package->cl-source-package sbcl-mcclim))
 
-(define-public ecl-mcclim
-  (let ((pkg (sbcl-package->ecl-package sbcl-mcclim)))
-    (package
-      (inherit pkg)
-      (arguments
-       (substitute-keyword-arguments arguments
-         ;; Tests fail with "FUNCTION: Not a valid argument (R1
-         ;; (GENERATE-REGION))."  on ECL.
-         ((#:tests? _ #f) #f))))))
-
 (define-public sbcl-md5
   (package
     (name "sbcl-md5")
@@ -29767,7 +29757,7 @@ the Processing language and shares some of the API.")
   ;; Update together with emacs-slime.
   (package
     (name "sbcl-slime-swank")
-    (version "2.31")
+    (version "2.32")
     (source
      (origin
        (file-name (git-file-name "cl-slime-swank" version))
@@ -29776,7 +29766,7 @@ the Processing language and shares some of the API.")
              (url "https://github.com/slime/slime/")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "0nv99wq2vz053p0rn9953rhmyz4g40zdl01mz7z9xbklxzbsx6x7"))
+        (base32 "0s7m7j7y1p8fb6ncpxcxdrrrxp5aw67xl7wrqy8zjjvwzljbs548"))
        (modules '((guix build utils)))
        (snippet
         ;; The doc folder drags `gawk' into the closure.  Doc is already