From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#36073] [PATCH 2/5] gnu: sway: Update to 1.1.1. Resent-Message-ID: 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 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Tobias Geerinckx-Rice Cc: stefanx2ovic@gmail.com, 36073 <36073@debbugs.gnu.org> --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=E2=80=A6 Wh= y 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/ --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-sway-Hardcode-path-to-swaybg.patch Content-Transfer-Encoding: quoted-printable >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 =C2=A9 2017 Oleg Pykhalov ;;; Copyright =C2=A9 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby -;;; Copyright =C2=A9 2018 Meiyo Peng +;;; Copyright =C2=A9 2018, 2019 Meiyo Peng ;;; Copyright =C2=A9 2019 Rutger Helling ;;; Copyright =C2=A9 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) --=20 2.22.0 --=-=-=--