From patchwork Fri Feb 17 17:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 47060 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 3356C168B2; Fri, 17 Feb 2023 17:04:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF70E16793 for ; Fri, 17 Feb 2023 17:04:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT484-0007MP-B7; Fri, 17 Feb 2023 12:02:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pT47d-0006nl-Gg for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT47c-0000MQ-EW for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT47c-00083D-6s for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61576] [PATCH 17/21] services: gnome-polkit-settings: Add spice-gtk. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 17:02:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61576@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61576-submit@debbugs.gnu.org id=B61576.167665331030784 (code B ref 61576); Fri, 17 Feb 2023 17:02:08 +0000 Received: (at 61576) by debbugs.gnu.org; 17 Feb 2023 17:01:50 +0000 Received: from localhost ([127.0.0.1]:41372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT47K-00080M-1k for submit@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:50 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:45574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT475-0007wC-3B for 61576@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:36 -0500 Received: by mail-qt1-f169.google.com with SMTP id d10so1418387qtr.12 for <61576@debbugs.gnu.org>; Fri, 17 Feb 2023 09:01:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jiuNBzC3IAKsCK7erCo5v0cDDDccj5Bnc0vesUbTjdo=; b=MLU0lKLXNbnd2hYfCD//zIQWByShGLd3Z5Y8jQ3PZuL922Zto5nHFDtdzdVXWlXfej tQtAPDLW/ZgWx217TN0q7zoTzljd+WWgg71H7uEdmPQtHsC9Z+P+W1pmDMLtipGhbMIJ mTDQc3tVwqj7bVKwQAtIVbgEjw+wvuVUr+uhDg9QjQEuw6vO2ZVe+8U+DCz3qDbG1yyh ejneTaj83VYQFDiGnqfi4qVmrDc063+gENEYpD520rVGp9bO2ObKtKInXgHl/yrvZNRz C/dk9uEzsJ+v05NxqSfdgVBWDKioA8BQXOIXaZds5dYNrQJmNGoKEH1SSY3ab2kr+tRQ wRyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jiuNBzC3IAKsCK7erCo5v0cDDDccj5Bnc0vesUbTjdo=; b=dkKqCKPkQPLBkL8C9LswOCCS0KntjdfFR05EkIY3U4Qub+aXBMY1paFIi87EDOYFL6 aIr7bUB6NdSRLmZpf8kr3pIt+B2ksKoohUBOAUabKG/39Y7QsMX+hyduEKbUisbns9rd Qk3Axdl32fkWVRtlkIvmhV/ancyNIwYgWK7ZPg8EXrBNaDL3AJTkj9E9zsO1NA8pVzhI zKSFC7FnYsWR9O0w1TuXAEtB5NAVzk7RLSFjzS+NoSSwPd7Mu7257tp6zCaWhDnufrEp c7TPeu/sPQn4xy+OMmobF3WHCLtO/h0Klqme2eSGv50uJzZMOwsFgdnnv6uQwlnMqLco axsA== X-Gm-Message-State: AO0yUKX7uo5y5ey10BwcP+RO4FuXmNAKHTyW8XLI8RZiiEB4fpxcwPb4 6pIbormZb9Acxt8/2SZ9L+duM7QX9k3eHUhb X-Google-Smtp-Source: AK7set8NZIy2CsEm3Re5/5usvFMYXrY6ZrOR5WQJAYhOyxWAQveoQSxKbCmbsrTvi8FN7GjyfeC7UA== X-Received: by 2002:ac8:5b87:0:b0:3af:b6bd:aba7 with SMTP id a7-20020ac85b87000000b003afb6bdaba7mr3632941qta.43.1676653294635; Fri, 17 Feb 2023 09:01:34 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id hf22-20020a05622a609600b003b85ed59fa2sm3455166qtb.50.2023.02.17.09.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 09:01:34 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 12:00:58 -0500 Message-Id: <20230217170103.10147-18-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217170103.10147-2-maxim.cournoyer@gmail.com> References: <20230217170103.10147-2-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/desktop.scm (gnome-polkit-settings): Add spice-gtk to the GNOME packages providing polkit rules. (package-direct-input-selector): Allow passing a list corresponding to the dependency tree, so that non-propagated transitive inputs can be specified. --- gnu/services/desktop.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index fe1f0fd20a..189334dc23 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Sou Bunnbu -;;; Copyright © 2017, 2020, 2022 Maxim Cournoyer +;;; Copyright © 2017, 2020, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2017 Nikita ;;; Copyright © 2018, 2020, 2022 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus @@ -183,11 +183,19 @@ (define-module (gnu services desktop) (define (bool value) (if value "true\n" "false\n")) -(define (package-direct-input-selector input) +(define (package-direct-input-selector tree) + "Return a procedure that selects TREE from the inputs of PACKAGE. If TREE +is a list, it recursively searches it until it locates the last item of TREE." (lambda (package) - (match (assoc-ref (package-direct-inputs package) input) - ((package . _) package)))) - + (let loop ((tree (if (pair? tree) + tree + (list tree))) + (package package)) + (if (null? tree) + package + (loop (cdr tree) + (car (assoc-ref (package-direct-inputs package) + (car tree)))))))) ;;; @@ -1360,7 +1368,10 @@ (define (gnome-polkit-settings config) '("gnome-settings-daemon" "gnome-control-center" "gnome-system-monitor" - "gvfs"))) + "gvfs" + ;; spice-gtk provides polkit actions for USB redirection + ;; in GNOME Boxes. + ("gnome-boxes" "spice-gtk")))) (define gnome-desktop-service-type (service-type