gnu: mutter: Update to 3.24.1.
* gnu/packages/gnome.scm (mutter): Update to 3.24.1. [source]: Use a release tarball instead of a git checkout. [arguments]: Enable wayland and the native backend. Add "use-elogind" phase. Remove "autoreconf" phase. [propagated-inputs]: Remove wayland and wayland-protocols. [inputs]: Add elogind and libxtst.
This commit is contained in:
parent
17cf06c385
commit
86c44e7230
|
@ -4315,20 +4315,17 @@ to display dialog boxes from the commandline and shell scripts.")
|
||||||
(license license:lgpl2.0+)))
|
(license license:lgpl2.0+)))
|
||||||
|
|
||||||
(define-public mutter
|
(define-public mutter
|
||||||
;; Uses the gnome 3.22 branch that only contains bug fixes.
|
|
||||||
(let ((commit "23c315ea7121e9bd108e2837d0b4beeba53c5e18"))
|
|
||||||
(package
|
(package
|
||||||
(name "mutter")
|
(name "mutter")
|
||||||
(version (git-version "3.22.2" "1" commit))
|
(version "3.24.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method url-fetch)
|
||||||
(uri (git-reference
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
(url "git://git.gnome.org/mutter")
|
(version-major+minor version) "/"
|
||||||
(commit commit)))
|
name "-" version ".tar.xz"))
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1v1f9xyzjr1ihmfwpq9kzlv2lyr9qn63ck8zny699mbp5hsi11mb"))))
|
"093ax3ng7fv28qfkxpbvcx67mfiizwj5b4s17m5cmijwf3wpgamc"))))
|
||||||
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
|
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
|
||||||
;; versions of cogl and clutter. As a result, many of the inputs,
|
;; versions of cogl and clutter. As a result, many of the inputs,
|
||||||
;; propagated-inputs, and configure flags used in cogl and clutter are
|
;; propagated-inputs, and configure flags used in cogl and clutter are
|
||||||
|
@ -4341,8 +4338,7 @@ to display dialog boxes from the commandline and shell scripts.")
|
||||||
;; implicit declaration of function ?roundf?
|
;; implicit declaration of function ?roundf?
|
||||||
(list "--enable-compile-warnings=minimum"
|
(list "--enable-compile-warnings=minimum"
|
||||||
|
|
||||||
"--disable-wayland" ; TODO enable wayland
|
"--enable-native-backend"
|
||||||
;; "--enable-native-backend" ; TODO enable the native backend
|
|
||||||
|
|
||||||
;; The following flags are needed for the bundled clutter
|
;; The following flags are needed for the bundled clutter
|
||||||
"--enable-x11-backend=yes"
|
"--enable-x11-backend=yes"
|
||||||
|
@ -4354,9 +4350,14 @@ to display dialog boxes from the commandline and shell scripts.")
|
||||||
"/lib/libGL.so"))
|
"/lib/libGL.so"))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'autoreconf
|
;; Replace references to systemd libraries to elogind references.
|
||||||
|
(add-before 'configure 'use-elogind
|
||||||
(lambda _
|
(lambda _
|
||||||
(zero? (system* "autoreconf" "-vfi")))))))
|
(substitute* (list "configure"
|
||||||
|
"src/backends/native/meta-launcher.c"
|
||||||
|
"src/core/main.c")
|
||||||
|
(("systemd") "elogind"))
|
||||||
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
|
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
|
||||||
("gobject-introspection" ,gobject-introspection)
|
("gobject-introspection" ,gobject-introspection)
|
||||||
|
@ -4389,17 +4390,17 @@ to display dialog boxes from the commandline and shell scripts.")
|
||||||
("mesa" ,mesa)
|
("mesa" ,mesa)
|
||||||
("pango" ,pango)
|
("pango" ,pango)
|
||||||
("udev" ,eudev)
|
("udev" ,eudev)
|
||||||
("wayland" ,wayland)
|
|
||||||
("wayland-protocols" ,wayland-protocols)
|
|
||||||
("xinput" ,xinput)))
|
("xinput" ,xinput)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("gnome-desktop" ,gnome-desktop)
|
`(("elogind" ,elogind)
|
||||||
|
("gnome-desktop" ,gnome-desktop)
|
||||||
("libcanberra-gtk" ,libcanberra)
|
("libcanberra-gtk" ,libcanberra)
|
||||||
("libgudev" ,libgudev)
|
("libgudev" ,libgudev)
|
||||||
("libice" ,libice)
|
("libice" ,libice)
|
||||||
("libsm" ,libsm)
|
("libsm" ,libsm)
|
||||||
("libxkbfile" ,libxkbfile)
|
("libxkbfile" ,libxkbfile)
|
||||||
("libxrandr" ,libxrandr)
|
("libxrandr" ,libxrandr)
|
||||||
|
("libxtst" ,libxtst)
|
||||||
("startup-notification" ,startup-notification)
|
("startup-notification" ,startup-notification)
|
||||||
("upower-glib" ,upower)
|
("upower-glib" ,upower)
|
||||||
("xkeyboard-config" ,xkeyboard-config)
|
("xkeyboard-config" ,xkeyboard-config)
|
||||||
|
@ -4411,7 +4412,7 @@ to display dialog boxes from the commandline and shell scripts.")
|
||||||
desktop via OpenGL. Mutter combines a sophisticated display engine using the
|
desktop via OpenGL. Mutter combines a sophisticated display engine using the
|
||||||
Clutter toolkit with solid window-management logic inherited from the Metacity
|
Clutter toolkit with solid window-management logic inherited from the Metacity
|
||||||
window manager.")
|
window manager.")
|
||||||
(license license:gpl2+))))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public gnome-online-accounts
|
(define-public gnome-online-accounts
|
||||||
(package
|
(package
|
||||||
|
|
Loading…
Reference in New Issue