* [WIP] Sway-wm, stuck on it for too long
@ 2017-06-03 13:48 ng0
0 siblings, 0 replies; only message in thread
From: ng0 @ 2017-06-03 13:48 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1.1: Type: text/plain, Size: 244 bytes --]
These 3 patches have been around in my checkout for a long time.
I run into https://github.com/SirCmpwn/sway/issues/1230 and the
developer seems to have no idea what is going on.
--
ng0
OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
[-- Attachment #1.2: 0001-gnu-Add-chck.patch --]
[-- Type: text/plain, Size: 2470 bytes --]
From 580567dd81fcaa109791c06d202866c6ca713b6d Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Sun, 11 Sep 2016 09:40:32 +0000
Subject: [PATCH 1/3] gnu: Add chck.
* gnu/packages/wm.scm (chck): New variable.
---
gnu/packages/wm.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index cd53091ce..7d0b29aea 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -40,6 +40,7 @@
#:use-module (guix build-system haskell)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages haskell)
#:use-module (gnu packages base)
#:use-module (gnu packages pkg-config)
@@ -58,6 +59,7 @@
#:use-module (gnu packages libevent)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages maths)
+ #:use-module (gnu packages valgrind)
#:use-module (gnu packages web)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
@@ -752,3 +754,34 @@ It is inspired by Xmonad and dwm. Its major features include:
@end itemize\n")
(home-page "https://github.com/conformal/spectrwm")
(license license:isc)))
+
+(define-public chck
+ (let* ((commit "0400fb5e9cf8fd84f7ad5f59822fa2c9d48e1267")
+ (revision "1"))
+ (package
+ (name "chck")
+ (version (string-append "0.0." revision "." (string-take commit 7)))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Cloudef/chck")
+ (commit commit)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "1lqy7djj28hhn4x656lglx4whndl8q4m85k8lzs36v95msmm2am6"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags (list
+ "-DCMAKE_BUILD_TYPE=Upstream")))
+ (inputs
+ `(("doxygen" ,doxygen)
+ ("zlib" ,zlib)
+ ("valgrind" ,valgrind)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (home-page "https://github.com/Cloudef/chck")
+ (synopsis "Collection of C utilities")
+ (description
+ "Collection of C utilities")
+ (license license:zlib))))
--
2.13.0
[-- Attachment #1.3: 0002-gnu-Add-wlc.patch --]
[-- Type: text/plain, Size: 2952 bytes --]
From c923bd7f78a9b8850b09430a4dd375e2a8f0feaf Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Sun, 11 Sep 2016 10:50:49 +0000
Subject: [PATCH 2/3] gnu: Add wlc.
* gnu/packages/wm.scm (wlc): New variable.
---
gnu/packages/wm.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7d0b29aea..e126d6f03 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -42,9 +42,11 @@
#:use-module (guix build-system python)
#:use-module (gnu packages compression)
#:use-module (gnu packages haskell)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages base)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pth)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
@@ -785,3 +787,54 @@ It is inspired by Xmonad and dwm. Its major features include:
(description
"Collection of C utilities")
(license license:zlib))))
+
+(define-public wlc
+ (package
+ (name "wlc")
+ (version "0.0.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/Cloudef/wlc/archive/v"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1d9albrwb17mqrqfcc6gag40f5yvc7qrs3p71l3ip80fwn8j6zyh"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags (list "-DCMAKE_BUILD_TYPE=Upstream"
+ "-DWLC_BUILD_EXAMPLES=OFF"
+ "-DWLC_BUILD_TESTS=OFF")))
+ (inputs
+ `(("pixman" ,pixman)
+ ("wayland" ,wayland)
+ ("libxkbcommon" ,libxkbcommon)
+ ("eudev" ,eudev)
+ ("libdrm" ,libdrm)
+ ("libinput" ,libinput)
+ ("libx11" ,libx11) ; x11-xcb, xfixes
+ ("libxcb" ,libxcb)
+ ("libxkbcommon" ,libxkbcommon)
+ ("xkeyboard-config" ,xkeyboard-config)
+ ("libxfixes" ,libxfixes)
+ ("pth" ,pth)
+ ("libxcomposite" ,libxcomposite)
+ ("mesa" ,mesa) ; libgbm, libegl, libglesv2
+ ("dbus" ,dbus)
+ ("xcb-util-image" ,xcb-util-image)
+ ("xcb-util-wm" ,xcb-util-wm)
+ ("xproxo" ,xproto)
+ ("xorg-server-xwayland" ,xorg-server-xwayland)
+ ("zlib" ,zlib)
+ ("elogind" ,elogind)
+ ("chck" ,chck)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("wayland-protocols" ,wayland-protocols)))
+ (home-page "https://github.com/Cloudef/wlc")
+ (synopsis "Helper library for Wayland compositors")
+ (description
+ "Wlc is a Wayland compositor library.")
+ (license (list license:expat
+ license:zlib))))
--
2.13.0
[-- Attachment #1.4: 0003-gnu-Add-sway.patch --]
[-- Type: text/plain, Size: 3033 bytes --]
From 252c9fb43c1b987d86ef12885455461b850a6ff8 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@libertad.pw>
Date: Thu, 19 Jan 2017 13:58:36 +0000
Subject: [PATCH 3/3] gnu: Add sway.
* gnu/packages/wm.scm (sway): New variable.
---
gnu/packages/wm.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e126d6f03..0425e0af3 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -62,6 +62,7 @@
#:use-module (gnu packages fribidi)
#:use-module (gnu packages maths)
#:use-module (gnu packages valgrind)
+ #:use-module (gnu packages video)
#:use-module (gnu packages web)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
@@ -838,3 +839,58 @@ It is inspired by Xmonad and dwm. Its major features include:
"Wlc is a Wayland compositor library.")
(license (list license:expat
license:zlib))))
+
+(define-public sway
+ (package
+ (name "sway")
+ (version "0.13.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/SirCmpwn/sway/archive/"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0zbzlxb48l8djm164n5cp0wvywlg0w4xs7iqk6zpf9yr52fhr8jn"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags (list "-DCMAKE_BUILD_TYPE=Release"
+ (string-append "-DCMAKE_INSTALL_SYSCONFDIR="
+ (assoc-ref %outputs "out")
+ "/etc")
+ (string-append "-DSWAY_VERSION=0.13.0"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'fix-clags
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("Werror") ""))
+ #t)))))
+ (inputs
+ `(("pixman" ,pixman)
+ ("wayland" ,wayland)
+ ("xorg-server-xwayland" ,xorg-server-xwayland)
+ ("wlc" ,wlc)
+ ("libcap" ,libcap)
+ ("pcre" ,pcre)
+ ("json-c" ,json-c)
+ ("pango" ,pango)
+ ("cairo" ,cairo)
+ ("gdk-pixbuf" ,gdk-pixbuf)
+ ("linux-pam" ,linux-pam)
+ ("imagemagick" ,imagemagick)
+ ("ffmpeg" ,ffmpeg)
+ ("libinput" ,libinput)
+ ("libxkbcommon" ,libxkbcommon)
+ ("elogind" ,elogind)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("asciidoc" ,asciidoc)))
+ (home-page "http://swaywm.org")
+ (synopsis "i3 compatible Wayland window manager")
+ (description
+ "Sway is a drop-in replacement for the i3 window manager, but for
+Wayland instead of X11. It works with your existing i3 configuration and
+supports most of i3's features, and a few extras.")
+ (license license:expat)))
--
2.13.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-06-03 13:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-03 13:48 [WIP] Sway-wm, stuck on it for too long ng0
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).