From e23b6a68008321179508d55780f9725cf649c610 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sun, 9 Jun 2019 16:15:50 +0800 Subject: gnu: sway: Hardcode path to swaybg. * gnu/packages/wm.scm (sway)[arguments]: Hardcode path to swaybg. [inputs]: Add swaybg. Signed-off-by: Marius Bakke --- gnu/packages/wm.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') 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) -- cgit v1.2.3 From ddd401d28fb09f1f8ce96f2fc24226887a812412 Mon Sep 17 00:00:00 2001 From: Meiyo Peng Date: Sun, 9 Jun 2019 18:10:20 +0800 Subject: gnu: swayidle: Add elogind support. * gnu/packages/wm.scm (swayidle)[arguments]: Add #:configure-flags. [inputs]: Add elogind. Signed-off-by: Marius Bakke --- gnu/packages/wm.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index eac17e0837..d5344dc31d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1249,7 +1249,10 @@ modules for building a Wayland compositor.") (sha256 (base32 "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v")))) (build-system meson-build-system) - (inputs `(("wayland" ,wayland))) + (arguments + `(#:configure-flags '("-Dlogind-provider=elogind"))) + (inputs `(("elogind" ,elogind) + ("wayland" ,wayland))) (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc) ("wayland-protocols" ,wayland-protocols))) -- cgit v1.2.3 From 7a1d6a770878fe5a45af8763559a86da0258b0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= Date: Wed, 12 Jun 2019 14:20:56 +0200 Subject: gnu: Add waybar. * gnu/packages/wm.scm(waybar): New variable. --- gnu/packages/wm.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d5344dc31d..5737fea8d9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018, 2019 Meiyo Peng ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2019 Gábor Boskovits ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,6 +86,10 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages man) #:use-module (gnu packages textutils) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages logging) + #:use-module (gnu packages serialization) + #:use-module (gnu packages commencement) ; TODO remove when default gcc version >=7 #:use-module (guix download) #:use-module (guix git-download)) @@ -1315,3 +1320,44 @@ modules for building a Wayland compositor.") (synopsis "Screen wallpaper utility for Wayland compositors") (description "Swaybg is a wallpaper utility for Wayland compositors.") (license license:expat))) ; MIT license + +(define-public waybar + (package + (name "waybar") + (version "0.6.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Alexays/Waybar.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wyp1p9r1k8jnjq8clp2fx8xa3f4lfrgbp67fxrjh9718p4br0ab")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (list (string-append "-Dout=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; TODO remove when issue #30756 is resolved + (add-before 'configure 'fix-gcc + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t))))) + (inputs `(("fmt" ,fmt) + ("gtkmm" ,gtkmm) + ("jsoncpp" ,jsoncpp) + ("libinput" ,libinput) + ("spdlog" ,spdlog) + ("wayland" ,wayland))) + (native-inputs `(("gcc-toolchain" ,gcc-toolchain-7) ; TODO remove when default gcc version >=7 + ("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://github.com/Alexays/Waybar") + (synopsis "Wayland bar for Sway and Wlroots based compositors.") + (description "Waybar is a highly customisable Wayland bar for Sway and +Wlroots based compositors.") + (license license:expat))) ; MIT license -- cgit v1.2.3 From de2d14f2ff3577f521b6dc9c52f45924249c1949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= Date: Mon, 17 Jun 2019 13:30:57 +0200 Subject: gnu: waybar: Add optional dependencies. * gnu/packages/wm.scm(waybar)[inputs]: Add libdbusmenu, libnl, libmpdclient and pulseaudio. --- gnu/packages/wm.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5737fea8d9..0b15801633 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1349,7 +1349,11 @@ modules for building a Wayland compositor.") (inputs `(("fmt" ,fmt) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) + ("libdbusmenu" ,libdbusmenu) ("libinput" ,libinput) + ("libmpdclent" ,libmpdclient) + ("libnl" ,libnl) + ("pulseaudio" ,pulseaudio) ("spdlog" ,spdlog) ("wayland" ,wayland))) (native-inputs `(("gcc-toolchain" ,gcc-toolchain-7) ; TODO remove when default gcc version >=7 -- cgit v1.2.3 From 46dc940c9af3d8b48966d16e52273ba88e92f946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= Date: Tue, 18 Jun 2019 00:22:46 +0200 Subject: gnu: Add mako. * gnu/packages/wm.scm (mako): New variable. --- gnu/packages/wm.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 0b15801633..90bc7fc883 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1365,3 +1365,31 @@ modules for building a Wayland compositor.") (description "Waybar is a highly customisable Wayland bar for Sway and Wlroots based compositors.") (license license:expat))) ; MIT license + +(define-public mako + (package + (name "mako") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/mako.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17azdc37xsbmx13fkfp23vg9lznrv9fh6nhagn64wdq3nhsxm3b6")))) + (build-system meson-build-system) + (inputs `(("cairo" ,cairo) + ("elogind" ,elogind) + ("gdk-pixbuf" ,gdk-pixbuf) + ("pango" ,pango) + ("wayland" ,wayland))) + (native-inputs `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://wayland.emersion.fr/mako") + (synopsis "Lightweight Wayland notification daemon") + (description "Mako is a lightweight notification daemon for Wayland +compositors that support the layer-shell protocol.") + (license license:expat))) ; MIT license -- cgit v1.2.3