From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcXNM-0006bN-HX for guix-patches@gnu.org; Thu, 27 Dec 2018 10:15:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gcXNG-00053v-NI for guix-patches@gnu.org; Thu, 27 Dec 2018 10:15:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51698) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gcXNG-00052y-Ip for guix-patches@gnu.org; Thu, 27 Dec 2018 10:15:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gcXNG-0002qX-B1 for guix-patches@gnu.org; Thu, 27 Dec 2018 10:15:02 -0500 Subject: [bug#33888] [PATCH] gnu: Add sway. Resent-Message-ID: Received: from eggs.gnu.org ([208.118.235.92]:59163) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcXMB-00056a-VA for guix-patches@gnu.org; Thu, 27 Dec 2018 10:13:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gcXDt-0004IM-3D for guix-patches@gnu.org; Thu, 27 Dec 2018 10:05:25 -0500 Received: from mx.kolabnow.com ([95.128.36.40]:53358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcXDs-0004GN-MD for guix-patches@gnu.org; Thu, 27 Dec 2018 10:05:21 -0500 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id C4CCC476 for ; Thu, 27 Dec 2018 16:05:18 +0100 (CET) Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dWdE9tu_p8lW for ; Thu, 27 Dec 2018 16:05:17 +0100 (CET) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 415742D0 for ; Thu, 27 Dec 2018 16:05:17 +0100 (CET) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 252C92C28 for ; Thu, 27 Dec 2018 16:05:17 +0100 (CET) Date: Thu, 27 Dec 2018 16:05:03 +0100 From: Rutger Helling Message-ID: <20181227160503.2d059a36@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/fsOa2TYRP1ItDGBKeZGbN6A"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33888@debbugs.gnu.org --Sig_/fsOa2TYRP1ItDGBKeZGbN6A Content-Type: multipart/mixed; boundary="MP_/jSSUNxKhnmZKmeBMrFB/8m/" --MP_/jSSUNxKhnmZKmeBMrFB/8m/ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hey Guix, these patches add Sway. Note that with (screen-locker-service sway "swaylock") we should now have a native Wayland screen locker. Supposedly this can be done without making the swaylock binary SUID, but I've been unable to figure out how. --MP_/jSSUNxKhnmZKmeBMrFB/8m/ Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-Add-wlroots.patch =46rom 0ea8db95fe1714ec4b27aafc418513757ab93dd0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 27 Dec 2018 15:43:41 +0100 Subject: [PATCH 1/2] gnu: Add wlroots. * gnu/packages/wm.scm (wlroots): 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 a761bce23..b9500f8db 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -42,6 +42,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) + #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (gnu packages haskell) @@ -77,6 +78,8 @@ #:use-module (gnu packages linux) #:use-module (gnu packages suckless) #:use-module (gnu packages mpd) + #:use-module (gnu packages gl) + #:use-module (gnu packages video) #:use-module (guix download) #:use-module (guix git-download)) =20 @@ -1094,3 +1097,49 @@ its size customizable status bars for their desktop environment. It has built-in functionality to display information about the most commonly used services= .") (license license:expat))) + +(define-public wlroots + (package + (name "wlroots") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/swaywm/wlroots.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-Dlogind-provider=3Delogind") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'hardcode-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "xwayland/xwayland.c" + (("Xwayland") (string-append (assoc-ref inputs + "xorg-server-xwayland") + "/bin/Xwayland"))) + #t))))) + (native-inputs `(("elogind" ,elogind) + ("eudev" ,eudev) + ("ffmpeg" ,ffmpeg) + ;("libcap" ,libcap) ; FIXME: Breaks DRM backend. + ("libinput" ,libinput) + ("libpng" ,libpng) + ("libxkbcommon" ,libxkbcommon) + ("mesa" ,mesa) + ("pixman" ,pixman) + ("pkg-config" ,pkg-config) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("xorg-server-xwayland" ,xorg-server-xwayland))) + (home-page "https://github.com/swaywm/wlroots") + (synopsis "Pluggable, composable, unopinionated modules for building a +Wayland compositor") + (description "wlroots is a set of pluggable, composable, unopinionated +modules for building a Wayland compositor.") + ; MIT license + (license license:expat))) --=20 2.20.1 --MP_/jSSUNxKhnmZKmeBMrFB/8m/ Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-Add-sway.patch =46rom ac73b2a037fb73547b5e14f5b90e1cc8383b8bad Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 27 Dec 2018 15:49:54 +0100 Subject: [PATCH 2/2] gnu: Add sway. * gnu/packages/wm.scm (sway): New variable. --- gnu/packages/wm.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b9500f8db..0bced1bc9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -80,6 +80,9 @@ #:use-module (gnu packages mpd) #:use-module (gnu packages gl) #:use-module (gnu packages video) + #:use-module (gnu packages gtk) + #:use-module (gnu packages man) + #:use-module (gnu packages version-control) #:use-module (guix download) #:use-module (guix git-download)) =20 @@ -1143,3 +1146,39 @@ Wayland compositor") modules for building a Wayland compositor.") ; MIT license (license license:expat))) + +(define-public sway + (package + (name "sway") + (version "1.0-beta.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/swaywm/sway.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f9rniwizbc3vzxdy6rc47749p6gczfbgfdy4r458134rbl551hw")))) + (build-system meson-build-system) + (native-inputs `(("cairo" ,cairo) + ("elogind" ,elogind) + ("gdk-pixbuf" ,gdk-pixbuf) + ("git" ,git) + ("json-c" ,json-c) + ("libcap" ,libcap) + ("libinput" ,libinput) + ("libxkbcommon" ,libxkbcommon) + ("linux-pam" ,linux-pam) + ("mesa" ,mesa) + ("pango" ,pango) + ("pkg-config" ,pkg-config) + ("scdoc" ,scdoc) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) + ("wlroots" ,wlroots))) + (home-page "https://github.com/swaywm/sway") + (synopsis "Wayland compositor compatible with i3") + (description "Sway is a i3-compatible Wayland compositor.") + ; MIT license + (license license:expat))) 2.20.1 --MP_/jSSUNxKhnmZKmeBMrFB/8m/-- --Sig_/fsOa2TYRP1ItDGBKeZGbN6A Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlwk6h8ACgkQ86cn20T8 yjZQ7Af/b6bIOk5OioOXXaATnms//h95IgPpzseB8QJerkx4dglnEpf0dIAAFTzh Cew+BfaoirwzZ32CILpWyZsH+0pWFLr06fipIG48E14XREaAgfn6jkQC7GAWW4XH bVFxnJyMZXQp3gmsdbfsxu2kXOfitnxxKAm6nN7roEZttcm2QrequWpwR/p7XZtP rVCMz2zO10B7tzzAqRVfC4A66OFM3G/ZPvtW34HzdNBwK/I0Ls8S0ePrjdswSBin S5HgG3kKu8yOP1lifDuBi6fgvaJyJ1Xw6OVH5E+/Ah2kVF75m0RHOBZJWobiCKvb 3GqglKJumv1kv9Dg36FfMiS6eMCHBw== =HOzE -----END PGP SIGNATURE----- --Sig_/fsOa2TYRP1ItDGBKeZGbN6A--