diff mbox

[PATCHv2,2/2] gnu: Add sway.

Message ID 20160827181710.29345-2-sleep_walker@gnu.org
State New
Headers show

Commit Message

Tomáš Čech Aug. 27, 2016, 6:17 p.m. UTC
* gnu/packages/freedesktop.scm(sway): New variable.
---
 gnu/packages/freedesktop.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

Comments

Efraim Flashner Sept. 7, 2016, 12:33 p.m. UTC | #1
On Sat, Aug 27, 2016 at 08:17:10PM +0200, Tomáš Čech wrote:
> * gnu/packages/freedesktop.scm(sway): New variable.
> ---
>  gnu/packages/freedesktop.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)

here you're missing the patch and registering it in gnu/local.mk

> 
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index 0bb87e7..fec7cf5 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -35,6 +35,7 @@
>    #:use-module (gnu packages gnome)
>    #:use-module (gnu packages python)
>    #:use-module (gnu packages pth)
> +  #:use-module (gnu packages pcre)
>    #:use-module (gnu packages linux)
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages autotools)
> @@ -56,6 +57,7 @@
>    #:use-module (gnu packages admin)
>    #:use-module (gnu packages polkit)
>    #:use-module (gnu packages databases)
> +  #:use-module (gnu packages web)
>    #:use-module (gnu packages xdisorg))
>  
>  (define-public xdg-utils
> @@ -686,3 +688,45 @@ wish to perform colour calibration.")
>       "This is wayland compositor library used by several projects like sway,
>  orbment or Gram.")
>      (license license:x11)))
> +
> +(define-public sway
> +  (package
> +    (name "sway")
> +    (version "0.9")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://github.com/SirCmpwn/" name "/archive/"
> +                    version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0bgli7scjlvbgas09dx5fnncgda41ssba6fzkw2vyk88pmdgx66w"))

here you need a (file-name

> +              (patches (list (search-patch "sway-debug.patch")))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     '(#:configure-flags '("-DVERBOSE=1")

I don't think it takes this configure flag.

> +       #:tests? #f)) ; no 'check' target
> +    (native-inputs
> +     `(("gdk-pixbuf" ,gdk-pixbuf)
> +       ("libxslt" ,libxslt)
> +       ("pkg-config" ,pkg-config)
> +       ("wayland" ,wayland)))
> +    (inputs
> +     `(("asciidoc" ,asciidoc)
> +       ("cairo" ,cairo)
> +       ("docbook-xml" ,docbook-xml)
> +       ("docbook-xsl" ,docbook-xsl)
> +       ("gdk-pixbuf" ,gdk-pixbuf)
> +       ("json-c" ,json-c)
> +       ("libinput" ,libinput)
> +       ("libxkbcommon" ,libxkbcommon)
> +       ("linux-pam" ,linux-pam)
> +       ("pango" ,pango)
> +       ("pcre" ,pcre)
> +       ("wlc" ,wlc)))

asciidoc. docbook-* can be native-inputs

> +    (synopsis "Window manager for Wayland, compatible with i3")
> +    (home-page "https://github.com/SirCmpwn/sway")
> +    (description
> +     "SirCmpwn's WAYland window manager is work-in-progress i3-compatible
> +tiling window manager.")
> +    (license license:x11)))
> -- 
> 2.9.2
> 
>
diff mbox

Patch

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 0bb87e7..fec7cf5 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -35,6 +35,7 @@ 
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages python)
   #:use-module (gnu packages pth)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages autotools)
@@ -56,6 +57,7 @@ 
   #:use-module (gnu packages admin)
   #:use-module (gnu packages polkit)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg))
 
 (define-public xdg-utils
@@ -686,3 +688,45 @@  wish to perform colour calibration.")
      "This is wayland compositor library used by several projects like sway,
 orbment or Gram.")
     (license license:x11)))
+
+(define-public sway
+  (package
+    (name "sway")
+    (version "0.9")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/SirCmpwn/" name "/archive/"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0bgli7scjlvbgas09dx5fnncgda41ssba6fzkw2vyk88pmdgx66w"))
+              (patches (list (search-patch "sway-debug.patch")))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:configure-flags '("-DVERBOSE=1")
+       #:tests? #f)) ; no 'check' target
+    (native-inputs
+     `(("gdk-pixbuf" ,gdk-pixbuf)
+       ("libxslt" ,libxslt)
+       ("pkg-config" ,pkg-config)
+       ("wayland" ,wayland)))
+    (inputs
+     `(("asciidoc" ,asciidoc)
+       ("cairo" ,cairo)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("json-c" ,json-c)
+       ("libinput" ,libinput)
+       ("libxkbcommon" ,libxkbcommon)
+       ("linux-pam" ,linux-pam)
+       ("pango" ,pango)
+       ("pcre" ,pcre)
+       ("wlc" ,wlc)))
+    (synopsis "Window manager for Wayland, compatible with i3")
+    (home-page "https://github.com/SirCmpwn/sway")
+    (description
+     "SirCmpwn's WAYland window manager is work-in-progress i3-compatible
+tiling window manager.")
+    (license license:x11)))