branch master updated: gnome: gnome-desktop: Add bubblewrap as an input.

[guix-commits]

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

cbaines pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 3857aba  gnome: gnome-desktop: Add bubblewrap as an input.
3857aba is described below

commit 3857aba7ab25c50d64a6d7468d2b5b09bc4f5d60
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sun Jun 7 21:20:08 2020 +0100

    gnome: gnome-desktop: Add bubblewrap as an input.
    
    This is expected to be available, oddly as libseccomp is available.  These
    changes fix thumbnails for Nautilus.
    
    * gnu/packages/gnome.scm (gnome-desktop)[arguments]: Add 'patch-bubblewrap
    phase.
    [inputs]: Add bubblewrap.
---
 gnu/packages/gnome.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e1b21c3..13769a7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1286,6 +1286,19 @@ offline sources, providing a centralized place for 
managing your contacts.")
                  (("\"locale\"")
                   (string-append "\"" libc "/bin/locale\"")))
                #t)))
+         (add-before 'configure 'patch-bubblewrap
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "libgnome-desktop/gnome-desktop-thumbnail-script.c"
+               (("\"bwrap\",")
+                (string-append "\"" (which "bwrap") "\","))
+               (("\"--ro-bind\", \"/usr\", \"/usr\",")
+                (string-append "\"--ro-bind\", \""
+                               (%store-directory)
+                               "\", \""
+                               (%store-directory)
+                               "\","))
+               (("\"--ro-bind\", \"/etc/ld.so.cache\", \"/etc/ld.so.cache\",") 
""))
+             #t))
          (add-before 'check 'pre-check
            (lambda* (#:key inputs #:allow-other-keys)
              ;; Tests require a running X server and locales.
@@ -1315,6 +1328,7 @@ offline sources, providing a centralized place for 
managing your contacts.")
     (inputs
      `(("gdk-pixbuf" ,gdk-pixbuf)
        ("glib" ,glib)
+       ("bubblewrap" ,bubblewrap)
        ("libxext" ,libxext)
        ("libxkbfile" ,libxkbfile)
        ("libxrandr" ,libxrandr)))