mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xdg-desktop-portal-1.16.0: Fix build.

Browse source 
* gnu/packages/freedesktop.scm (xdg-desktop-portal)[native-inputs]: Use
gettext-minimal-0.21.
[arguments]: Use G-Expressions.  Add phase "disable-test".

Change-Id: Id86b75543dd8451ecd4b3248411e291045df803f
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-04 10:52:56 +01:00
parent 498f8d7f35
commit 81ec2e53e8
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/freedesktop.scm
View file

@ -3133,7 +3133,9 @@ (define-public xdg-desktop-portal
("libtool" ,libtool)
("glib:bin" ,glib "bin")
("which" ,which)
("gettext" ,gettext-minimal)))
;; Autoconf up to and including 2.72 installs a po/Makefile.in.in from
;; gettext-0.18 which does not work with gettext-0.23.
("gettext" ,gettext-minimal-0.21)))
(inputs
`(("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
@ -3146,18 +3148,25 @@ (define-public xdg-desktop-portal
("pipewire" ,pipewire)
("fuse" ,fuse)))
(arguments
`(#:configure-flags
(list "--with-systemd=no")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'po-chmod
(lambda _
;; Make sure 'msgmerge' can modify the PO files.
(for-each (lambda (po)
(chmod po #o666))
(find-files "po" "\\.po$"))))
(add-after 'unpack 'set-home-directory
(lambda _ (setenv "HOME" "/tmp"))))))
(list
#:configure-flags
#~(list "--with-systemd=no")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'po-chmod
(lambda _
;; Make sure 'msgmerge' can modify the PO files.
(for-each (lambda (po)
(chmod po #o666))
(find-files "po" "\\.po$"))))
(add-after 'unpack 'disable-test
(lambda _
(substitute* "tests/test-portals.c"
;; This test now fails, with gcc-11-13 too.
(("g_.*/portal/inhibit/monitor/" all)
(string-append "// " all)))))
(add-after 'unpack 'set-home-directory
(lambda _ (setenv "HOME" "/tmp"))))))
(native-search-paths
(list (search-path-specification
(variable "XDG_DESKTOP_PORTAL_DIR")