From patchwork Sun Jun 7 20:22:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 22600 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5769C27BBE3; Sun, 7 Jun 2020 21:23:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2786327BBE1 for ; Sun, 7 Jun 2020 21:23:08 +0100 (BST) Received: from localhost ([::1]:35850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ji1ox-00072R-NU for patchwork@mira.cbaines.net; Sun, 07 Jun 2020 16:23:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ji1os-00072J-CJ for guix-patches@gnu.org; Sun, 07 Jun 2020 16:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ji1os-0003Bq-1v for guix-patches@gnu.org; Sun, 07 Jun 2020 16:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ji1or-0004AX-Us for guix-patches@gnu.org; Sun, 07 Jun 2020 16:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41756] [PATCH] gnome: gnome-desktop: Add bubblewrap as an input. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jun 2020 20:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41756 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41756@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159156135515976 (code B ref -1); Sun, 07 Jun 2020 20:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jun 2020 20:22:35 +0000 Received: from localhost ([127.0.0.1]:55036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ji1oQ-00049c-Mi for submit@debbugs.gnu.org; Sun, 07 Jun 2020 16:22:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:38168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ji1oO-00049T-RK for submit@debbugs.gnu.org; Sun, 07 Jun 2020 16:22:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ji1oO-000706-LZ for guix-patches@gnu.org; Sun, 07 Jun 2020 16:22:32 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:39821) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ji1oN-00031g-NO for guix-patches@gnu.org; Sun, 07 Jun 2020 16:22:32 -0400 Received: from localhost (unknown [46.237.173.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 6191027BBE1 for ; Sun, 7 Jun 2020 21:22:29 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 05d8ccaf for ; Sun, 7 Jun 2020 20:22:26 +0000 (UTC) From: Christopher Baines Date: Sun, 7 Jun 2020 21:22:26 +0100 Message-Id: <20200607202226.15637-1-mail@cbaines.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/07 16:22:29 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)))