* [PATCH 1/2] gnu: Add wlc. @ 2016-08-25 19:10 Tomáš Čech 2016-08-25 19:10 ` [PATCH 2/2] gnu: Add sway Tomáš Čech 2016-08-26 8:13 ` [PATCH " Alex Kost 0 siblings, 2 replies; 12+ messages in thread From: Tomáš Čech @ 2016-08-25 19:10 UTC (permalink / raw) To: guix-devel * gnu/packages/freedesktop.scm(wlc): New variable. * gnu/packages/patches/wlc-implement-wlc_view_get_pid.patch: Add it * gnu/local.mk: Add entry for patch above. --- gnu/packages/freedesktop.scm | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 67f1e1a..07a6e0b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -27,10 +27,14 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (gnu packages) + #:use-module (gnu packages gl) #:use-module (gnu packages gnome) #:use-module (gnu packages python) + #:use-module (gnu packages pth) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) @@ -51,7 +55,8 @@ #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages polkit) - #:use-module (gnu packages databases)) + #:use-module (gnu packages databases) + #:use-module (gnu packages xdisorg)) (define-public xdg-utils (package @@ -647,3 +652,37 @@ different sorts of messages in different formats.") useful for both applications which need colour management and applications that wish to perform colour calibration.") (license license:lgpl2.1+))) + +(define-public wlc + (package + (name "wlc") + (version "0.0.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/Cloudef/" name "/releases/download/v" + version "/" name "-" version ".tar.bz2")) + (sha256 + (base32 + "0dmiklis820qzin74f16bmbz1jkjy93r5mix8cqbcqpb9f7qxahp")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libinput" ,libinput) + ("libx11" ,libx11) + ("libxkbcommon" ,libxkbcommon) + ("mesa" ,mesa) + ("pixman" ,pixman) + ("pth" ,pth) + ("wayland" ,wayland) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-wm" ,xcb-util-wm) + ("xproto" ,xproto) + ("zlib" ,zlib))) + (synopsis "Wayland Compositor Library") + (home-page "https://github.com/Cloudef/wlc") + (description + "This is wayland compositor library used by several projects like sway, +orbment or Guile-WM.") + (license license:x11))) -- 2.9.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/2] gnu: Add sway. 2016-08-25 19:10 [PATCH 1/2] gnu: Add wlc Tomáš Čech @ 2016-08-25 19:10 ` Tomáš Čech 2016-08-26 13:34 ` Alex Griffin 2016-08-26 8:13 ` [PATCH " Alex Kost 1 sibling, 1 reply; 12+ messages in thread From: Tomáš Čech @ 2016-08-25 19:10 UTC (permalink / raw) To: guix-devel * gnu/packages/freedesktop.scm(sway): New variable. --- gnu/packages/freedesktop.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 07a6e0b..597fcaf 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 Guile-WM.") (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/Cloudef/wlc") + (description + "SirCmpwn's WAYland window manager is work-in-progress i3-compatible +tiling window manager.") + (license license:x11))) -- 2.9.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] gnu: Add sway. 2016-08-25 19:10 ` [PATCH 2/2] gnu: Add sway Tomáš Čech @ 2016-08-26 13:34 ` Alex Griffin 2016-08-27 18:17 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech 0 siblings, 1 reply; 12+ messages in thread From: Alex Griffin @ 2016-08-26 13:34 UTC (permalink / raw) To: Tomáš Čech, guix-devel On Thu, Aug 25, 2016, at 02:10 PM, Tomáš Čech wrote: > + (home-page "https://github.com/Cloudef/wlc") This looks like the wrong homepage to me. -- Alex Griffin ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCHv2 1/2] gnu: Add wlc. 2016-08-26 13:34 ` Alex Griffin @ 2016-08-27 18:17 ` Tomáš Čech 2016-08-27 18:17 ` [PATCHv2 2/2] gnu: Add sway Tomáš Čech ` (2 more replies) 0 siblings, 3 replies; 12+ messages in thread From: Tomáš Čech @ 2016-08-27 18:17 UTC (permalink / raw) To: guix-devel * gnu/packages/freedesktop.scm(wlc): New variable. * gnu/packages/patches/wlc-implement-wlc_view_get_pid.patch: Add it * gnu/local.mk: Add entry for patch above. --- gnu/packages/freedesktop.scm | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 67f1e1a..0bb87e7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -27,10 +27,14 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (gnu packages) + #:use-module (gnu packages gl) #:use-module (gnu packages gnome) #:use-module (gnu packages python) + #:use-module (gnu packages pth) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages autotools) @@ -51,7 +55,8 @@ #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages polkit) - #:use-module (gnu packages databases)) + #:use-module (gnu packages databases) + #:use-module (gnu packages xdisorg)) (define-public xdg-utils (package @@ -647,3 +652,37 @@ different sorts of messages in different formats.") useful for both applications which need colour management and applications that wish to perform colour calibration.") (license license:lgpl2.1+))) + +(define-public wlc + (package + (name "wlc") + (version "0.0.5") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/Cloudef/" name "/releases/download/v" + version "/" name "-" version ".tar.bz2")) + (sha256 + (base32 + "0dmiklis820qzin74f16bmbz1jkjy93r5mix8cqbcqpb9f7qxahp")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libinput" ,libinput) + ("libx11" ,libx11) + ("libxkbcommon" ,libxkbcommon) + ("mesa" ,mesa) + ("pixman" ,pixman) + ("pth" ,pth) + ("wayland" ,wayland) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-wm" ,xcb-util-wm) + ("xproto" ,xproto) + ("zlib" ,zlib))) + (synopsis "Wayland Compositor Library") + (home-page "https://github.com/Cloudef/wlc") + (description + "This is wayland compositor library used by several projects like sway, +orbment or Gram.") + (license license:x11))) -- 2.9.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCHv2 2/2] gnu: Add sway. 2016-08-27 18:17 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech @ 2016-08-27 18:17 ` Tomáš Čech 2016-09-07 12:33 ` Efraim Flashner 2016-09-06 8:07 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech 2016-09-07 11:40 ` Efraim Flashner 2 siblings, 1 reply; 12+ messages in thread From: Tomáš Čech @ 2016-08-27 18:17 UTC (permalink / raw) To: guix-devel * gnu/packages/freedesktop.scm(sway): New variable. --- gnu/packages/freedesktop.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) 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))) -- 2.9.2 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCHv2 2/2] gnu: Add sway. 2016-08-27 18:17 ` [PATCHv2 2/2] gnu: Add sway Tomáš Čech @ 2016-09-07 12:33 ` Efraim Flashner 0 siblings, 0 replies; 12+ messages in thread From: Efraim Flashner @ 2016-09-07 12:33 UTC (permalink / raw) To: Tomáš Čech; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 3160 bytes --] 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 > > -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 1/2] gnu: Add wlc. 2016-08-27 18:17 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech 2016-08-27 18:17 ` [PATCHv2 2/2] gnu: Add sway Tomáš Čech @ 2016-09-06 8:07 ` Tomáš Čech 2016-09-07 11:40 ` Efraim Flashner 2 siblings, 0 replies; 12+ messages in thread From: Tomáš Čech @ 2016-09-06 8:07 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 213 bytes --] I'm not sure if the silence in this thread means that patches are fine or forgotten so I'm sending new e-mail here. If there are no objections, I'll commit the patches at the end of the week. Best regards, S_W [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 1/2] gnu: Add wlc. 2016-08-27 18:17 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech 2016-08-27 18:17 ` [PATCHv2 2/2] gnu: Add sway Tomáš Čech 2016-09-06 8:07 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech @ 2016-09-07 11:40 ` Efraim Flashner 2016-09-07 11:57 ` David Craven 2 siblings, 1 reply; 12+ messages in thread From: Efraim Flashner @ 2016-09-07 11:40 UTC (permalink / raw) To: Tomáš Čech; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 3728 bytes --] On Sat, Aug 27, 2016 at 08:17:09PM +0200, Tomáš Čech wrote: > * gnu/packages/freedesktop.scm(wlc): New variable. > * gnu/packages/patches/wlc-implement-wlc_view_get_pid.patch: Add it > * gnu/local.mk: Add entry for patch above. there's no patch attached > --- > gnu/packages/freedesktop.scm | 41 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 40 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm > index 67f1e1a..0bb87e7 100644 > --- a/gnu/packages/freedesktop.scm > +++ b/gnu/packages/freedesktop.scm > @@ -27,10 +27,14 @@ > #:use-module (guix packages) > #:use-module (guix download) > #:use-module (guix git-download) > + #:use-module (guix build-system cmake) > #:use-module (guix build-system gnu) > #:use-module (guix build-system python) > + #:use-module (gnu packages) > + #:use-module (gnu packages gl) > #:use-module (gnu packages gnome) > #:use-module (gnu packages python) > + #:use-module (gnu packages pth) > #:use-module (gnu packages linux) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages autotools) > @@ -51,7 +55,8 @@ > #:use-module (gnu packages acl) > #:use-module (gnu packages admin) > #:use-module (gnu packages polkit) > - #:use-module (gnu packages databases)) > + #:use-module (gnu packages databases) > + #:use-module (gnu packages xdisorg)) > > (define-public xdg-utils > (package > @@ -647,3 +652,37 @@ different sorts of messages in different formats.") > useful for both applications which need colour management and applications that > wish to perform colour calibration.") > (license license:lgpl2.1+))) > + > +(define-public wlc > + (package > + (name "wlc") > + (version "0.0.5") > + (source (origin > + (method url-fetch) > + (uri (string-append > + "https://github.com/Cloudef/" name "/releases/download/v" > + version "/" name "-" version ".tar.bz2")) > + (sha256 > + (base32 > + "0dmiklis820qzin74f16bmbz1jkjy93r5mix8cqbcqpb9f7qxahp")))) > + (build-system cmake-build-system) > + (native-inputs > + `(("pkg-config" ,pkg-config))) > + (inputs > + `(("libinput" ,libinput) > + ("libx11" ,libx11) > + ("libxkbcommon" ,libxkbcommon) > + ("mesa" ,mesa) > + ("pixman" ,pixman) > + ("pth" ,pth) > + ("wayland" ,wayland) > + ("xcb-util-image" ,xcb-util-image) > + ("xcb-util-wm" ,xcb-util-wm) > + ("xproto" ,xproto) > + ("zlib" ,zlib))) > + (synopsis "Wayland Compositor Library") > + (home-page "https://github.com/Cloudef/wlc") > + (description > + "This is wayland compositor library used by several projects like sway, > +orbment or Gram.") > + (license license:x11))) > -- > 2.9.2 > > The package doesn't seem to be able to find all of the wayland libraries it wants. -- Found WAYLAND_CLIENT: /gnu/store/9jfrsgr6jw9hzqj81p3vn632m79x5gla-wayland-1.11.0/lib/libwayland-client.so -- Found WAYLAND_SERVER: /gnu/store/9jfrsgr6jw9hzqj81p3vn632m79x5gla-wayland-1.11.0/lib/libwayland-server.so -- Could NOT find WAYLAND_EGL (missing: WAYLAND_EGL_LIBRARIES) -- Could NOT find WAYLAND (missing: WAYLAND_LIBRARIES) This results in it saying it can't find wayland. Also, why not also include wayland-protocols and dbus? -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCHv2 1/2] gnu: Add wlc. 2016-09-07 11:40 ` Efraim Flashner @ 2016-09-07 11:57 ` David Craven 0 siblings, 0 replies; 12+ messages in thread From: David Craven @ 2016-09-07 11:57 UTC (permalink / raw) To: Efraim Flashner; +Cc: guix-devel > This results in it saying it can't find wayland. He's probably using the mesa enable wayland flags patch from core-updates... ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] gnu: Add wlc. 2016-08-25 19:10 [PATCH 1/2] gnu: Add wlc Tomáš Čech 2016-08-25 19:10 ` [PATCH 2/2] gnu: Add sway Tomáš Čech @ 2016-08-26 8:13 ` Alex Kost 2016-08-26 9:50 ` Tomáš Čech 1 sibling, 1 reply; 12+ messages in thread From: Alex Kost @ 2016-08-26 8:13 UTC (permalink / raw) To: Tomáš Čech; +Cc: guix-devel Tomáš Čech (2016-08-25 22:10 +0300) wrote: > + (description > + "This is wayland compositor library used by several projects like sway, > +orbment or Guile-WM.") Are you sure about Guile-WM? AFAIK it uses XCB, but not Wayland. Here is an excerpt from Guile-WM's readme: 4.2 Even Crazier Wish List ────────────────────────── ... • Build a WM on top of Wayland. That would require a Scheme Wayland client, which could be built along the lines of Guile XCB, since the Wayland projects comes with the same kind of XML spec files that XCB uses. -- Alex ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] gnu: Add wlc. 2016-08-26 8:13 ` [PATCH " Alex Kost @ 2016-08-26 9:50 ` Tomáš Čech 2016-09-11 10:53 ` ng0 0 siblings, 1 reply; 12+ messages in thread From: Tomáš Čech @ 2016-08-26 9:50 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 436 bytes --] On Fri, Aug 26, 2016 at 11:13:43AM +0300, Alex Kost wrote: >Tomáš Čech (2016-08-25 22:10 +0300) wrote: > >> + (description >> + "This is wayland compositor library used by several projects like sway, >> +orbment or Guile-WM.") > >Are you sure about Guile-WM? AFAIK it uses XCB, but not Wayland. Thanks for the catch. I actully meant Gram. https://github.com/emallson/gram I'll send updated the patch. S_W [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] gnu: Add wlc. 2016-08-26 9:50 ` Tomáš Čech @ 2016-09-11 10:53 ` ng0 0 siblings, 0 replies; 12+ messages in thread From: ng0 @ 2016-09-11 10:53 UTC (permalink / raw) To: Tomáš Čech, guix-devel [-- Attachment #1: Type: text/plain, Size: 404 bytes --] I was working on this package too, I've packaged chck but fail at wlc because it can't find WaylandProtocols. Do we miss something in a wayland related package? I'll append the patch for both chck and wlc, maybe you want to pick it up again. I'd be interested in getting sway on Guix. If you don't want to work on this, I'll continue debugging and would welcome input on the wayland protocols problem. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-Add-chck.patch --] [-- Type: text/x-patch, Size: 2385 bytes --] From 30ebfaf471d57242863e7239669b42d41fba78d4 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/2] 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 6275e6f..b784181 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -34,6 +34,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) + #:use-module (gnu packages compression) #:use-module (gnu packages haskell) #:use-module (gnu packages base) #:use-module (gnu packages pkg-config) @@ -51,6 +52,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) @@ -457,3 +459,34 @@ experience.") dynamic and extensible using the Lua programming language.") (license license:gpl2+) (home-page "https://awesome.naquadah.org/"))) + +(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.10.0 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: 0002-gnu-Add-wlc.patch --] [-- Type: text/x-patch, Size: 2857 bytes --] From c3038eb951ec86eab093806c346fcbf0bad9be79 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/2] gnu: Add wlc. * gnu/packages/wm.scm (wlc): New variable. --- gnu/packages/wm.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b784181..c52392c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -36,9 +36,11 @@ #:use-module (guix build-system haskell) #: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) @@ -490,3 +492,50 @@ dynamic and extensible using the Lua programming language.") (description "Collection of C utilities") (license license:zlib)))) + +(define-public wlc + (package + (name "wlc") + (version "0.0.5") + (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 + "06w22l5igbnbdbln05f42py8q30rl3g5hh7inrv187gv0c33zqna")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list + "-DCMAKE_BUILD_TYPE=Upstream"))) + ;; (string-append "-DCMAKE_INSTALL_LIBDIR=" + ;; (assoc-ref %outputs "out") "/lib") + ;; (string-append "-DCMAKE_INSTALL_PREFIX=" + ;; (assoc-ref %outputs "out"))))) + (inputs + `(("pixman" ,pixman) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("libxkbcommon" ,libxkbcommon) + ("eudev" ,eudev) + ("libinput" ,libinput) + ("libx11" ,libx11) ; x11-xcb, xfixes + ("libxcb" ,libxcb) + ("pth" ,pth) + ("libxcomposite" ,libxcomposite) + ("mesa" ,mesa) ; libgbm, libegl, libglesv2 + ("libdrm" ,libdrm) + ("dbus" ,dbus) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-wm" ,xcb-util-wm) + ("xproxo" ,xproto) + ("zlib" ,zlib) + ("chck" ,chck))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/Cloudef/wlc") + (synopsis "Wayland compositor library") + (description + "wlc is a Wayland compositor library.") + (license license:expat))) -- 2.10.0 [-- Attachment #4: Type: text/plain, Size: 590 bytes --] Tomáš Čech <sleep_walker@gnu.org> writes: > [ Unknown signature status ] > On Fri, Aug 26, 2016 at 11:13:43AM +0300, Alex Kost wrote: >>Tomáš Čech (2016-08-25 22:10 +0300) wrote: >> >>> + (description >>> + "This is wayland compositor library used by several projects like sway, >>> +orbment or Guile-WM.") >> >>Are you sure about Guile-WM? AFAIK it uses XCB, but not Wayland. > > Thanks for the catch. I actully meant Gram. > > https://github.com/emallson/gram > > I'll send updated the patch. > > S_W -- ng0 For non-prism friendly talk find me on http://www.psyced.org ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-09-11 10:53 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-08-25 19:10 [PATCH 1/2] gnu: Add wlc Tomáš Čech 2016-08-25 19:10 ` [PATCH 2/2] gnu: Add sway Tomáš Čech 2016-08-26 13:34 ` Alex Griffin 2016-08-27 18:17 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech 2016-08-27 18:17 ` [PATCHv2 2/2] gnu: Add sway Tomáš Čech 2016-09-07 12:33 ` Efraim Flashner 2016-09-06 8:07 ` [PATCHv2 1/2] gnu: Add wlc Tomáš Čech 2016-09-07 11:40 ` Efraim Flashner 2016-09-07 11:57 ` David Craven 2016-08-26 8:13 ` [PATCH " Alex Kost 2016-08-26 9:50 ` Tomáš Čech 2016-09-11 10:53 ` 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).