me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gnome-builder: Upgrade to 41.2.

Browse source 
* gnu/packages/gnome.scm: Import modules llvm and markup for gnome-builder.
(gnome-builder): Upgrade to 41.2.
[arguments]: Add #:glib-or-gtk? #t to compile the schemas.
[configure-flags]: Enable more plugins.
[phase patch-meson]: Pretend we’re building with webkit2gtk-4.1.
[inputs]: Add cmark (markup support), clang and llvm, devhelp, glade,
libportal and libsoup 2.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Vivien Kraus 2021-11-18 14:21:45 +01:00 • committed by Ludovic Courtès
parent ee98739c83
commit 9502c56bfb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/gnome.scm
View file

@ -147,9 +147,11 @@
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lirc) #:use-module (gnu packages lirc)
#:use-module (gnu packages llvm)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages mail) #:use-module (gnu packages mail)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages markup)
#:use-module (gnu packages mp3) #:use-module (gnu packages mp3)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages music) #:use-module (gnu packages music)
@ -12311,25 +12313,22 @@ libraries. Applications do not need to be recompiled--or even restarted.")
(define-public gnome-builder (define-public gnome-builder
(package (package
(name "gnome-builder") (name "gnome-builder")
(version "3.36.1") (version "41.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" (version-major version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2")))) "04p031i999dccbnlbysmr6f93x7dji7b559j6yhdsqbqgxb7ncan"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list "-Dnetwork_tests=false" `(#:glib-or-gtk? #t ; To wrap binaries and compile schemas
#:configure-flags (list "-Dnetwork_tests=false"
;; TODO: Enable all plugins... ;; TODO: Enable all plugins...
"-Dplugin_clang=false" ;; Flatpak plugin wants libsoup 2
"-Dplugin_flatpak=false" "-Dplugin_flatpak=false"
"-Dplugin_glade=false"
;; XXX: This one has been shown not to work in
;; <https://issues.guix.gnu.org/45272>
"-Dplugin_jedi=false"
;; ... except this one. ;; ... except this one.
"-Dplugin_update_manager=false") "-Dplugin_update_manager=false")
#:phases #:phases
@ -12343,6 +12342,8 @@ libraries. Applications do not need to be recompiled--or even restarted.")
(("/usr/lib") (("/usr/lib")
(string-append (assoc-ref inputs "python-pygobject") (string-append (assoc-ref inputs "python-pygobject")
"/lib"))) "/lib")))
(substitute* "meson.build"
(("webkit2gtk-4.0") "webkit2gtk-4.1"))
#t)) #t))
(add-after 'configure 'fix-ninja (add-after 'configure 'fix-ninja
(lambda _ (lambda _
@ -12357,7 +12358,10 @@ libraries. Applications do not need to be recompiled--or even restarted.")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
#t))))) #t)))))
(inputs (inputs
`(("devhelp" ,devhelp) `(("cmark" ,cmark)
("clang" ,clang)
("devhelp" ,devhelp)
("glade" ,glade3)
("gspell" ,gspell) ("gspell" ,gspell)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
@ -12365,6 +12369,9 @@ libraries. Applications do not need to be recompiled--or even restarted.")
("libdazzle" ,libdazzle) ("libdazzle" ,libdazzle)
("libgit2-glib" ,libgit2-glib) ("libgit2-glib" ,libgit2-glib)
("libpeas" ,libpeas) ("libpeas" ,libpeas)
("libportal" ,libportal)
("libsoup" ,libsoup-minimal-2)
("llvm" ,llvm)
("python-pygobject" ,python-pygobject) ("python-pygobject" ,python-pygobject)
("sysprof" ,sysprof) ("sysprof" ,sysprof)
("template-glib" ,template-glib) ("template-glib" ,template-glib)