--- Begin Message ---
|
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
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#41756] [PATCH] gnome: gnome-desktop: Add bubblewrap as an input. |
|
Date: |
Sat, 13 Jun 2020 12:04:38 +0100 |
|
User-agent: |
mu4e 1.2.0; emacs 26.3 |
Ludovic Courtès <ludo@gnu.org> writes:
> Hi!
>
> (There’s a typo in the subject prefix.)
>
> Christopher Baines <mail@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
Description: PGP signature
--- End Message ---