me
/
guix
Archived
1
0
Fork 0
Code

gnu: gnome-session: Update to 42.0. 

* gnu/packages/gnome.scm (gnome-session): Update to 42.0.
[meson]: Delete argument.
[phases]{wrap-gnome-session}: Use search-input-file.
[native-inputs]: Remove labels and sort lexicographically.
master
Maxim Cournoyer 2022-09-05 01:00:08 -04:00
parent 02b4c6f3ab
commit 212f9c62bf
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/gnome.scm
View File

@ -7340,7 +7340,7 @@ such as gzip tarballs.")
(define-public gnome-session (define-public gnome-session
(package (package
(name "gnome-session") (name "gnome-session")
(version "40.1") (version "42.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -7349,37 +7349,35 @@ such as gzip tarballs.")
(patches (search-patches "gnome-session-support-elogind.patch")) (patches (search-patches "gnome-session-support-elogind.patch"))
(sha256 (sha256
(base32 (base32
"02z0xr6sv9ibl7awbw9j4y05hf4jk1zgvsbbmh7n27hhjvsvc8pl")))) "1alwjqr36rd0s132qs2clwnxgilcbylps6lm41lr50mn782hdjiw"))))
(arguments (arguments
`(#:meson ,meson-0.60 `(#:glib-or-gtk? #t
#:glib-or-gtk? #t
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap-gnome-session (add-after 'install 'wrap-gnome-session
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
;; Make sure 'gnome-session' finds the 'gsettings' program. ;; Make sure 'gnome-session' finds the 'gsettings' program.
(let ((glib (assoc-ref inputs "glib:bin")) (wrap-program (search-input-file outputs "bin/gnome-session")
(out (assoc-ref outputs "out"))) `("PATH" ":" prefix
(wrap-program (string-append out "/bin/gnome-session") (,(dirname (search-input-file (or native-inputs inputs)
`("PATH" ":" prefix (,(string-append glib "/bin")))))))) "bin/gdbus"))))))))
#:configure-flags #:configure-flags
'("-Ddocbook=false" ; FIXME: disabled because of docbook validation error '("-Ddocbook=false" ; FIXME: disabled because of docbook validation error
"-Dman=false" ; FIXME: disabled because of docbook validation error "-Dman=false" ; FIXME: disabled because of docbook validation error
"-Delogind=true" "-Delogind=true"
"-Dsystemd=false" "-Dsystemd=false"
"-Dsystemd_session=disable" "-Dsystemd_session=disable"
"-Dsystemd_journal=false"))) "-Dsystemd_journal=false")))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. (list docbook-xml
("pkg-config" ,pkg-config) docbook-xsl
("intltool" ,intltool) `(,glib "bin") ; for glib-compile-schemas, etc.
("xsltproc" ,libxslt) intltool
("libxml2" ,libxml2) ;for 'XML_CATALOG_FILES' libxml2 ;for 'XML_CATALOG_FILES'
("docbook-xsl" ,docbook-xsl) libxslt
("docbook-xml" ,docbook-xml) pkg-config
("xmlto" ,xmlto))) xmlto))
(inputs (inputs
(list elogind (list elogind
gnome-desktop gnome-desktop