From patchwork Wed Jun 22 09:52:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 40224 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 97B2F27BBEA; Wed, 22 Jun 2022 10:53:19 +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 592AA27BBE9 for ; Wed, 22 Jun 2022 10:53:19 +0100 (BST) Received: from localhost ([::1]:57610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3x30-0005Fa-FB for patchwork@mira.cbaines.net; Wed, 22 Jun 2022 05:53:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3x2j-0005FF-Uk for guix-patches@gnu.org; Wed, 22 Jun 2022 05:53:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o3x2j-0004Ja-M5 for guix-patches@gnu.org; Wed, 22 Jun 2022 05:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o3x2j-0005Ok-KR for guix-patches@gnu.org; Wed, 22 Jun 2022 05:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56094] [PATCH v3] 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 09:53: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 Cc: Liliana Marie Prikler Received: via spool by 56094-submit@debbugs.gnu.org id=B56094.165589157420736 (code B ref 56094); Wed, 22 Jun 2022 09:53:01 +0000 Received: (at 56094) by debbugs.gnu.org; 22 Jun 2022 09:52:54 +0000 Received: from localhost ([127.0.0.1]:34071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3x2b-0005OO-Vo for submit@debbugs.gnu.org; Wed, 22 Jun 2022 05:52:54 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:43590 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3x2Z-0005OF-Fh for 56094@debbugs.gnu.org; Wed, 22 Jun 2022 05:52:52 -0400 Received: from localhost ([127.0.0.1]:35146) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1o3x0F-0004yz-U0; Wed, 22 Jun 2022 09:50:28 +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:Cc:To:From:Sender:Reply-To: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=xE4OCUi/mdZ+c3oXQVIkiqjjLR8+YRpKHRk8PZSVOpY=; b=vEpyMkTSN3uM+kcvqFBL4JGgDi AQMgkgTd2HeIAmjIWGhdOgjcQYSpRVsDZ3NTbm7vRxc3qDRqIB78D7gwFlsSn5Uujpsu23IrJlTlX gU2Kew4G6IZTm06pDbuTpEgsL4jNvJ1sCeADZt47DoB9PhIftgUu99UM129gg1Ary+IGisSzW+Tnd DYGhjr9uIAH5r3ssm7aH/TCeEZwjqADQrfTOq1C26uG61H6DW0KxYE8dVf/uro5QWc8A/K4PDRar3 aUBaHudm17fFO7XkiLGMG66GDGGTOWG5Knmvvl/QPl3laWIAaI7A9MaO85TVMDxKFl0tnjsZutWAX iwqLFiMyjtM1kijg18pGpHS90tMRoTg2Pau9MTZB1asg+gqD1loKiMplCzyp4Eub4eonP4fU2mHtR Rk0S7xBwWVQ5rW8KQ43EZDgjBRHOJ3KUaZ9v7z2WDBI3ZgYruRizVgeo2yM9ghbQ/RcusdCMGcLOB cp1xprTNgTZ7+GeC12BzFokR; Received: from muradm by localhost with local (Exim 4.95) (envelope-from ) id 1o3x2X-00040r-Cc; Wed, 22 Jun 2022 12:52:49 +0300 From: muradm Date: Wed, 22 Jun 2022 12:52:49 +0300 Message-Id: <20220622095249.15421-1-mail@muradm.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: 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): Replace ‘elogind’ with ‘basu’. [inputs]: Replace ‘elogind’ with ‘basu’. [arguments]: <#:configure-flags>: Request building against basu. `elogind` still exists as transitive propagated input, while `meson.build` auto detects by probing `systemd`, `elogind` and `basu` in respective order. --- gnu/packages/wm.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index ecc79f73b9..7570e37239 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1572,7 +1572,8 @@ (define-public sway (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j")))) (build-system meson-build-system) (arguments - `(#:phases + `(#:configure-flags '("-Dsd-bus-provider=basu") + #:phases (modify-phases %standard-phases (add-before 'configure 'hardcode-paths (lambda* (#:key inputs #:allow-other-keys) @@ -1587,8 +1588,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