[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: sway: Hardcode path to swaybg.
|
From: |
guix-commits |
|
Subject: |
03/03: gnu: sway: Hardcode path to swaybg. |
|
Date: |
Fri, 14 Jun 2019 08:08:49 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit e23b6a68008321179508d55780f9725cf649c610
Author: Meiyo Peng <address@hidden>
Date: Sun Jun 9 16:15:50 2019 +0800
gnu: sway: Hardcode path to swaybg.
* gnu/packages/wm.scm (sway)[arguments]: Hardcode path to swaybg.
[inputs]: Add swaybg.
Signed-off-by: Marius Bakke <address@hidden>
---
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 f0589e9..eac17e0 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -17,7 +17,7 @@
;;; Copyright © 2017 Oleg Pykhalov <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Pierre-Antoine Rouby <address@hidden>
-;;; Copyright © 2018 Meiyo Peng <address@hidden>
+;;; Copyright © 2018, 2019 Meiyo Peng <address@hidden>
;;; Copyright © 2019 Rutger Helling <address@hidden>
;;; Copyright © 2019 Timothy Sample <address@hidden>
;;;
@@ -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)