GNU bug report logs - #41756
[PATCH] gnome: gnome-desktop: Add bubblewrap as an input.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41756 in the body.
You can then email your comments to 41756 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnome: gnome-desktop: Add bubblewrap as an input.
Date: Sun,  7 Jun 2020 21:22:26 +0100

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 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 592cab0b49..92411fb698 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1286,6 +1286,20 @@ 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\",")
+                "\"--ro-bind\", \"/run/current-system\", \"/run/current-system\","))
+             #t))
          (add-before 'check 'pre-check
            (lambda* (#:key inputs #:allow-other-keys)
              ;; Tests require a running X server and locales.
@@ -1315,6 +1329,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)))
-- 
2.26.2

Message #8 received at 41756 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 41756 <at> debbugs.gnu.org
Subject: Re: [bug#41756] [PATCH] gnome: gnome-desktop: Add bubblewrap as an
 input.
Date: Tue, 09 Jun 2020 09:36:59 +0200

Hi!

(There’s a typo in the subject prefix.)

Christopher Baines <mail <at> cbaines.net> skribis:

> 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.

Nice, I didn’t know the thumbnailer would do that.

> +         (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\",")
> +                "\"--ro-bind\", \"/run/current-system\", \"/run/current-system\","))

Perhaps we can replace this second --ro-bind with the empty string?

Otherwise LGTM!

Ludo’.

Message #13 received at 41756-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 41756-done <at> debbugs.gnu.org
Subject: Re: [bug#41756] [PATCH] gnome: gnome-desktop: Add bubblewrap as an
 input.
Date: Sat, 13 Jun 2020 12:04:38 +0100

[Message part 1 (text/plain, inline)]

Ludovic Courtès <ludo <at> gnu.org> writes:

> Hi!
>
> (There’s a typo in the subject prefix.)
>
> Christopher Baines <mail <at> cbaines.net> skribis:
>
>> 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.
>
> Nice, I didn’t know the thumbnailer would do that.
>
>> +         (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\",")
>> +                "\"--ro-bind\", \"/run/current-system\", \"/run/current-system\","))
>
> Perhaps we can replace this second --ro-bind with the empty string?
>
> Otherwise LGTM!

Great, I've replaced the second --ro-bind as you suggested, that seems
not to be necessary. I've pushed as
3857aba7ab25c50d64a6d7468d2b5b09bc4f5d60.

Thanks,

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.