* [PATCH 1/3] gnu: Add chck.
2017-01-31 20:07 Sway - a wayland i3 compatible compositor [RFC] contact.ng0
@ 2017-01-31 20:07 ` contact.ng0
2017-01-31 20:07 ` [PATCH 2/3] gnu: Add wlc contact.ng0
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: contact.ng0 @ 2017-01-31 20:07 UTC (permalink / raw)
To: guix-devel; +Cc: ng0
From: ng0 <ng0@we.make.ritual.n0.is>
* 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 8612867f4..aec1ed139 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -38,6 +38,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system haskell)
#: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)
@@ -56,6 +57,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)
@@ -632,3 +634,34 @@ all of them. Currently supported window managers include:
@end enumerate\n")
(home-page "http://menumaker.sourceforge.net/")
(license license:bsd-2)))
+
+(define-public chck
+ (let* ((commit "55d41fbf2c9f58500a0dca8402a3151c6e50742a")
+ (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
+ "13lm9m696jmrghzsbs508sv0y1ccspczb6ipyn917f1xd0fr53j2"))))
+ (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.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] gnu: Add wlc.
2017-01-31 20:07 Sway - a wayland i3 compatible compositor [RFC] contact.ng0
2017-01-31 20:07 ` [PATCH 1/3] gnu: Add chck contact.ng0
@ 2017-01-31 20:07 ` contact.ng0
2017-01-31 20:07 ` [PATCH 3/3] gnu: Add sway contact.ng0
2017-02-02 17:30 ` Sway - a wayland i3 compatible compositor [RFC] Maxim Cournoyer
3 siblings, 0 replies; 5+ messages in thread
From: contact.ng0 @ 2017-01-31 20:07 UTC (permalink / raw)
To: guix-devel; +Cc: ng0
From: ng0 <ng0@we.make.ritual.n0.is>
* 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 aec1ed139..8d3c1ca6b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -40,9 +40,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)
@@ -665,3 +667,54 @@ all of them. Currently supported window managers include:
(description
"Collection of C utilities")
(license license:zlib))))
+
+(define-public wlc
+ (package
+ (name "wlc")
+ (version "0.0.7")
+ (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
+ "1b7pz2jcff49bbw5iw38hnhdqsaazx665qjgqhnprxw8b9w4mgf5"))))
+ (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.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] gnu: Add sway.
2017-01-31 20:07 Sway - a wayland i3 compatible compositor [RFC] contact.ng0
2017-01-31 20:07 ` [PATCH 1/3] gnu: Add chck contact.ng0
2017-01-31 20:07 ` [PATCH 2/3] gnu: Add wlc contact.ng0
@ 2017-01-31 20:07 ` contact.ng0
2017-02-02 17:30 ` Sway - a wayland i3 compatible compositor [RFC] Maxim Cournoyer
3 siblings, 0 replies; 5+ messages in thread
From: contact.ng0 @ 2017-01-31 20:07 UTC (permalink / raw)
To: guix-devel; +Cc: ng0
From: ng0 <ng0@libertad.pw>
* 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 8d3c1ca6b..97e96f2e9 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -60,6 +60,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)
@@ -718,3 +719,58 @@ all of them. Currently supported window managers include:
"Wlc is a Wayland compositor library.")
(license (list license:expat
license:zlib))))
+
+(define-public sway
+ (package
+ (name "sway")
+ (version "0.11")
+ (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
+ "0r29r02qyw66vjn5d9bzgnr95si1n6gbd76sv028gns9r2pihk9x"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags (list "-DCMAKE_BUILD_TYPE=Release"
+ (string-append "-DCMAKE_INSTALL_SYSCONFDIR="
+ (assoc-ref %outputs "out")
+ "/etc")
+ "-DGIT_COMMIT_HASH=0.11")
+ #: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.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: Sway - a wayland i3 compatible compositor [RFC]
2017-01-31 20:07 Sway - a wayland i3 compatible compositor [RFC] contact.ng0
` (2 preceding siblings ...)
2017-01-31 20:07 ` [PATCH 3/3] gnu: Add sway contact.ng0
@ 2017-02-02 17:30 ` Maxim Cournoyer
3 siblings, 0 replies; 5+ messages in thread
From: Maxim Cournoyer @ 2017-02-02 17:30 UTC (permalink / raw)
To: contact.ng0; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]
Hi ng0,
contact.ng0@cryptolab.net writes:
> Right now I'm stuck at the manpage generation of sway, the dependencies are alright.
>
> Error message below. Help is welcome :)
>
> -- Configuring done
> -- Generating done
> -- Build files have been written to: /tmp/guix-build-sway-0.11.drv-0/build
> phase `configure' succeeded after 2.8 seconds
> starting phase `patch-generated-file-shebangs'
[...]
> /tmp/guix-build-sway-0.11.drv-0/build/bin
> /tmp/guix-build-sway-0.11.drv-0/sway-0.11/sway/sway.1.txt
> a2x: WARNING: --destination-dir option is only applicable to HTML based outputs
> a2x: WARNING: --destination-dir option is only applicable to HTML based outputs
> a2x: ERROR: "xsltproc" --stringparam callout.graphics 0 --stringparam
Is xsltproc available in a "guix environment sway" environment? If not,
you should add it as a native-input to your sway package definition. We
have a couple examples where xsltproc is used to generate manpages. One
example I'm familiar with is the udisks package, in (gnu packages freedesktop).
Good luck!
Maxim
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread