branch master updated: gnu: wl-clipboard: Don't require helper tools in $PATH.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new df48a11  gnu: wl-clipboard: Don't require helper tools in $PATH.
df48a11 is described below

commit df48a11e1b3e842f54603a6ef170e77aca47062a
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sat May 15 18:51:42 2021 +0200

    gnu: wl-clipboard: Don't require helper tools in $PATH.
    
    * gnu/packages/xdisorg.scm (wl-clipboard)[arguments]: Add a new
    'patch-file-names phase.
    [inputs]: Add coreutils and xdg-utils.
    
    Reported by pineapples in #guix.
---
 gnu/packages/xdisorg.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 15c5377..b5bacd3 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2235,11 +2235,25 @@ binary to setuid-binaries:
        (sha256
         (base32 "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d"))))
     (build-system meson-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-file-names
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* (find-files "src" "\\.c$")
+               (("\"(cat|rm)\"" _ command)
+                (string-append "\"" (assoc-ref inputs "coreutils")
+                               "/bin/" command "\""))
+               (("\"xdg-mime\"")
+                (string-append "\"" (assoc-ref inputs "xdg-utils")
+                               "/bin/xdg-mime\""))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
-     `(("wayland" ,wayland)
-       ("wayland-protocols" ,wayland-protocols)))
+     `(("coreutils" ,coreutils)
+       ("wayland" ,wayland)
+       ("wayland-protocols" ,wayland-protocols)
+       ("xdg-utils" ,xdg-utils)))
     (home-page "https://github.com/bugaevc/wl-clipboard";)
     (synopsis "Command-line copy/paste utilities for Wayland")
     (description "Wl-clipboard is a set of command-line copy/paste utilities 
for