diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-07 17:43:20 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-07 17:43:20 +0100 |
| commit | 6d15516dc6ffca3622ff49179c5c7c360c11b54b (patch) | |
| tree | d235b60e0605fd3aace9c3357a20658dac3e3d85 /gnu/packages/xdisorg.scm | |
| parent | 0ed75a5f068541339bc1db6271796a3d382bb681 (diff) | |
| parent | 982eff9e841f3539e4ecf93669435a290bfde571 (diff) | |
| download | guix-6d15516dc6ffca3622ff49179c5c7c360c11b54b.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/xdisorg.scm')
| -rw-r--r-- | gnu/packages/xdisorg.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1b671c15ac..a85e88a544 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -302,28 +302,31 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "0.8.4") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0")))) - (build-system gnu-build-system) + "1q4v378sr9ad8fy9znl7k8xpf0wch655r9m6z0bcc7sw1azsminl")))) + (build-system meson-build-system) (inputs `(("libx11" ,libx11) ("libxcb" ,libxcb) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) ("xkeyboard-config" ,xkeyboard-config))) (native-inputs `(("bison" ,bison) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) (arguments `(#:configure-flags - (list (string-append "--with-xkb-config-root=" + (list (string-append "-Dxkb-config-root=" (assoc-ref %build-inputs "xkeyboard-config") "/share/X11/xkb") - (string-append "--with-x-locale-root=" + (string-append "-Dx-locale-root=" (assoc-ref %build-inputs "libx11") "/share/X11/locale")))) (home-page "https://xkbcommon.org/") @@ -462,7 +465,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.99") + (version "2.4.100") (source (origin (method url-fetch) @@ -472,7 +475,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "0pnsw4bmajzdbz8pk4wswdmw93shhympf2q9alhbnpfjgsf57gsd")) + "0p8a1l3a3s40i81mawm8nhrbk7p97ss05qkawp1yx73c30lchz67")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system meson-build-system) (arguments |