diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 15:06:06 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 15:06:06 +0100 |
| commit | ebfe259f6682b43d7f0d3b57b525e25f97410052 (patch) | |
| tree | e3f09eb6159168e1736f8a629286eb3d148917a9 /gnu/packages/freedesktop.scm | |
| parent | 47b3eed821cf86c350dc4b0fdbe75647cdc275b0 (diff) | |
| parent | 8cc3983a4d02a15ad4a863671c1a5a8b2b542625 (diff) | |
| download | guix-ebfe259f6682b43d7f0d3b57b525e25f97410052.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/freedesktop.scm')
| -rw-r--r-- | gnu/packages/freedesktop.scm | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ae4c18e037..6e2061b413 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> @@ -36,6 +36,7 @@ #: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 meson) #:use-module (guix build-system perl) @@ -152,7 +153,7 @@ freedesktop.org project.") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" - name "-" version ".tar.xz")) + "libinput-" version ".tar.xz")) (sha256 (base32 "0pgla0mc6mvyr1ljy10mcqvfz8i5z6yp7dbx2bcd70y67wx05d0j")))) @@ -452,6 +453,33 @@ applications, X servers (rootless or fullscreen) or other display servers.") (home-page "https://wayland.freedesktop.org") (license license:expat))) +(define-public waylandpp + (package + (name "waylandpp") + (version "0.2.5") + (home-page "https://github.com/NilsBrause/waylandpp") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (sha256 + (base32 + "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ;no tests + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("mesa" ,mesa) + ("pugixml" ,pugixml))) + (propagated-inputs + `(;; In Requires of the .pc files. + ("wayland" ,wayland))) + (synopsis "Wayland C++ bindings") + (description + "This package provides C++ bindings for the Wayland display protocol.") + (license license:bsd-2))) + (define-public weston (package (name "weston") |