From patchwork Wed Jun 22 10:35:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 40226 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 3F71F27BBED; Wed, 22 Jun 2022 11:36:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 B002B27BBEA for ; Wed, 22 Jun 2022 11:36:11 +0100 (BST) Received: from localhost ([::1]:40184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3xiU-00036X-RH for patchwork@mira.cbaines.net; Wed, 22 Jun 2022 06:36:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3xiM-00036D-0R for guix-patches@gnu.org; Wed, 22 Jun 2022 06:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o3xiL-0002kV-Nd for guix-patches@gnu.org; Wed, 22 Jun 2022 06:36:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o3xiL-0000Ne-K2 for guix-patches@gnu.org; Wed, 22 Jun 2022 06:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56094] [PATCH v4] gnu: wm: Switch sway from elogind to basu. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jun 2022 10:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56094 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56094@debbugs.gnu.org, Liliana Marie Prikler Received: via spool by 56094-submit@debbugs.gnu.org id=B56094.16558941531448 (code B ref 56094); Wed, 22 Jun 2022 10:36:01 +0000 Received: (at 56094) by debbugs.gnu.org; 22 Jun 2022 10:35:53 +0000 Received: from localhost ([127.0.0.1]:34116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3xiD-0000NI-I7 for submit@debbugs.gnu.org; Wed, 22 Jun 2022 06:35:53 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:43596 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3xiB-0000Mz-Df for 56094@debbugs.gnu.org; Wed, 22 Jun 2022 06:35:52 -0400 Received: from localhost ([127.0.0.1]:35152) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1o3xfr-0004zn-7m; Wed, 22 Jun 2022 10:33:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Mt6RpGljFKbAJx/i68Z4TrTgE6TUSKTOiKfDFYv0/uo=; b=Y7uqn18bhvH99WBm3QggK/n1I5 xRMwDtOhyAYx7y+roLFrWPP9C+3aJSSddpzy7zKSyUrJlPoRwJrenXEa7+BmUbPAcUWEvC5g2a7Lm V+yFWlv+z0LKS43UZxgSesKbrvpGokK6SMFiYjJZ7NMHIvikcZvEqZ+LW0OJJQe1tGG7sL92c+vNn /VOkzmG5v6Ol9diYEaBW1clvaSn5enuOVbCalADcrSdMTw8hlXeo+15alFVJ5XN1/IUNnKZ81HPKo ReO4DtHw2j1btdEnrgaa/9iJVwKeIJwPegZEtDg+q5PSg77fy8ZFKLjy0yUY/6EYzNs0bmIlFKfjL JuqPyHH1I2ySaA3QhoaoT/b5NrrDRBbc2l3s21g5La+i/tkBTp7lVe2xxgItFIosrk3Eub0MSdV7m 1cMD23lNQgJQcE5fH8cIAf34TsEDbcQz2rFEW1hRKRZ9Id2/qcwVIG4dcWdOlLuS7Q649UQgS+A/a 4PauywuyLohumMV62XZJNZsu; Received: from muradm by localhost with local (Exim 4.95) (envelope-from ) id 1o3xi8-0004nn-M3; Wed, 22 Jun 2022 13:35:48 +0300 From: muradm Date: Wed, 22 Jun 2022 13:35:48 +0300 Message-Id: <20220622103548.18453-1-mail@muradm.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <16e543f33eb1870d0da3a2dbf41e4c2279e4c57d.camel@ist.tugraz.at> References: <16e543f33eb1870d0da3a2dbf41e4c2279e4c57d.camel@ist.tugraz.at> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wm.scm (sway): [inputs]: Replace ‘elogind’ with ‘basu’. [arguments]: Add -Dsd-bus-provider=basu flag. --- gnu/packages/wm.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index ecc79f73b9..0ea7641db3 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1572,7 +1572,10 @@ (define-public sway (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j")))) (build-system meson-build-system) (arguments - `(#:phases + `(;; elogind is propagated by wlroots -> libseat + ;; and would otherwise shadow basu. + #:configure-flags '("-Dsd-bus-provider=basu") + #:phases (modify-phases %standard-phases (add-before 'configure 'hardcode-paths (lambda* (#:key inputs #:allow-other-keys) @@ -1587,8 +1590,8 @@ (define-public sway (string-append "'" (assoc-ref inputs "scdoc") "/bin/scdoc'"))) #t))))) - (inputs (list cairo - elogind + (inputs (list basu + cairo gdk-pixbuf json-c libevdev