nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mutter: Update to HEAD. 

* gnu/packages/gnome.scm (mutter): Update to HEAD.
  [native-inputs]: Add autoconf, automake and libtool.
  [arguments]: Add autoreconf phase.
This commit is contained in:
David Craven 2017-02-01 19:51:53 +01:00
parent fa73a7c1b3
commit f23052a638
No known key found for this signature in database
GPG Key ID: 33B9E9FDE28D2C23
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/gnome.scm
View File

@ -4244,17 +4244,20 @@ 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 "3.22.2") (version (git-version "3.22.2" "1" commit))
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (git-reference
(version-major+minor version) "/" (url "git://git.gnome.org/mutter")
name "-" version ".tar.xz")) (commit commit)))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"18lj80klfnkwh0cb3ab0i1vfvzbp0zjl73x9d7pna4dsdhsmi6ym")))) "1v1f9xyzjr1ihmfwpq9kzlv2lyr9qn63ck8zny699mbp5hsi11mb"))))
;; 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
@ -4277,12 +4280,21 @@ to display dialog boxes from the commandline and shell scripts.")
"--enable-cogl-gst" "--enable-cogl-gst"
(string-append "--with-gl-libname=" (string-append "--with-gl-libname="
(assoc-ref %build-inputs "mesa") (assoc-ref %build-inputs "mesa")
"/lib/libGL.so")))) "/lib/libGL.so"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(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)
("intltool" ,intltool) ("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)
;; For git build
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(propagated-inputs (propagated-inputs
`(;; libmutter.pc refers to these: `(;; libmutter.pc refers to these:
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
@ -4328,7 +4340,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