From patchwork Mon Jun 10 06:01:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Meiyo Peng X-Patchwork-Id: 14277 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 14EF91704B; Mon, 10 Jun 2019 07:02:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E31D117042 for ; Mon, 10 Jun 2019 07:02:10 +0100 (BST) Received: from localhost ([::1]:40972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haDNh-0003R0-O1 for patchwork@mira.cbaines.net; Mon, 10 Jun 2019 02:02:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50343) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haDNe-0003JH-45 for guix-patches@gnu.org; Mon, 10 Jun 2019 02:02:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haDNb-0000gA-8z for guix-patches@gnu.org; Mon, 10 Jun 2019 02:02:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42288) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1haDNa-0000fd-J3 for guix-patches@gnu.org; Mon, 10 Jun 2019 02:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1haDNa-0001oG-Dd for guix-patches@gnu.org; Mon, 10 Jun 2019 02:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36073] [PATCH 2/5] gnu: sway: Update to 1.1.1. Resent-From: Meiyo Peng Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Jun 2019 06:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice Received: via spool by 36073-submit@debbugs.gnu.org id=B36073.15601465066926 (code B ref 36073); Mon, 10 Jun 2019 06:02:02 +0000 Received: (at 36073) by debbugs.gnu.org; 10 Jun 2019 06:01:46 +0000 Received: from localhost ([127.0.0.1]:55830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1haDNE-0001nY-9A for submit@debbugs.gnu.org; Mon, 10 Jun 2019 02:01:46 -0400 Received: from mx1.riseup.net ([198.252.153.129]:36980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1haDNC-0001nH-19 for 36073@debbugs.gnu.org; Mon, 10 Jun 2019 02:01:39 -0400 Received: from capuchin.riseup.net (capuchin-pn.riseup.net [10.0.1.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id E13521A233F; Sun, 9 Jun 2019 23:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1560146497; bh=tmKhud9yQQ7WxGvV4thHiV64EgDCwHbDvz3HKnENCNk=; h=References:From:To:Cc:Subject:In-reply-to:Date:From; b=KkSkIyE31heDm/vrDSj6400azlZMKfUdyudaGNvJnA7NTEYJfn7dq0lkuayfixXix 37ty8Gw/CAsqpmrMKSY9m5rcVhK/35bFx1FEX7SozUKrbNvKXnK7Xju5j+k9aNhsXN tkWMwKil1IzAxBIFs18C7v/SZ7DJc7ykG4J0QOU0= X-Riseup-User-ID: 1EC4005AE83B3B00352EAC1CE99121AA2F03BA90DE8A9B154762D00AEDDCDF8E Received: from [127.0.0.1] (localhost [127.0.0.1]) by capuchin.riseup.net (Postfix) with ESMTPSA id AF4241210AD; Sun, 9 Jun 2019 23:01:35 -0700 (PDT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e8fbf81b; Mon, 10 Jun 2019 06:01:30 +0000 (UTC) References: <87lfyayyj8.fsf@riseup.net> <87ftoi5ecu.fsf@nckx> From: Meiyo Peng In-reply-to: <87ftoi5ecu.fsf@nckx> Date: Mon, 10 Jun 2019 14:01:30 +0800 Message-ID: <87d0jmnflx.fsf@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanx2ovic@gmail.com, 36073 <36073@debbugs.gnu.org> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi Tobias, Tobias Geerinckx-Rice writes: > Meiyo Peng wrote: >> The author states that swaybg is now a standalone program but it should >> be treated as a required dependency of sway. So we should add swaybg >> into sway's propagated-inputs. > > I don't quite see the connection between these two sentences… Why propagated? "output" is a built-in command of sway. Lack of swaybg breaks this command: #+begin_src conf output "*" background ~/Pictures/wallpaper.jpg fill #+end_src I somehow forgot the Guix way to solve this problem is to hardcode the path to /gnu/store/*-swaybg-*/bin/swaybg. Silly me. And thank you for your remind. See the new attachment. Thanks. --- Meiyo Peng https://www.pengmeiyu.com/ From 92ea5e8bade96f6f9a19c76de35fa54bfd2ff84f Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sun, 9 Jun 2019 16:15:50 +0800 Subject: [PATCH] gnu: sway: Hardcode path to swaybg. * gnu/packages/wm.scm (sway)[arguments]: Hardcode path to swaybg. [inputs]: Add swaybg. --- gnu/packages/wm.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f0589e98f1..eac17e0837 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018 Meiyo Peng +;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Timothy Sample ;;; @@ -1201,6 +1201,12 @@ modules for building a Wayland compositor.") (modify-phases %standard-phases (add-before 'configure 'hardcode-paths (lambda* (#:key inputs #:allow-other-keys) + ;; Hardcode path to swaybg. + (substitute* "sway/config.c" + (("strdup..swaybg..") + (string-append "strdup(\"" (assoc-ref inputs "swaybg") + "/bin/swaybg\")"))) + ;; Hardcode path to scdoc. (substitute* "meson.build" (("scdoc.get_pkgconfig_variable..scdoc..") (string-append "'" (assoc-ref inputs "scdoc") @@ -1214,6 +1220,7 @@ modules for building a Wayland compositor.") ("libinput" ,libinput) ("libxkbcommon" ,libxkbcommon) ("pango" ,pango) + ("swaybg" ,swaybg) ("wayland" ,wayland) ("wlroots" ,wlroots))) (native-inputs `(("git" ,git) -- 2.22.0