Archived
1
0
Fork 0

gnu: gtk+-2: Remove trailing #t and use gexps.

* gnu/packages/gtk.scm (gtk+-2) [phases]: Remove trailing #t.
[arguments]: Use gexps.
This commit is contained in:
Maxim Cournoyer 2022-11-18 20:09:58 -05:00
parent abecd9c128
commit 051a6068b6
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -906,14 +906,14 @@ is part of the GNOME accessibility project.")
python-wrapper python-wrapper
xorg-server-for-tests)) xorg-server-for-tests))
(arguments (arguments
`(#:parallel-tests? #f (list
#:parallel-tests? #f
#:configure-flags #:configure-flags
(list "--with-xinput=yes" #~(list "--with-xinput=yes"
(string-append "--with-html-dir=" (string-append "--with-html-dir=" #$output
(assoc-ref %outputs "doc")
"/share/gtk-doc/html")) "/share/gtk-doc/html"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
(substitute* "gtk/Makefile.in" (substitute* "gtk/Makefile.in"
@ -927,8 +927,7 @@ is part of the GNOME accessibility project.")
(("g_test_add_func.*test_fill_empty\\);") (("g_test_add_func.*test_fill_empty\\);")
"") "")
(("g_test_add_func.*test_tag\\);") (("g_test_add_func.*test_tag\\);")
"")) ""))))
#t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; Tests require a running X server. ;; Tests require a running X server.
@ -939,14 +938,11 @@ is part of the GNOME accessibility project.")
;; Tests look for $XDG_RUNTIME_DIR. ;; Tests look for $XDG_RUNTIME_DIR.
(setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'. ;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0") (setenv "DBUS_FATAL_WARNINGS" "0")))
#t))
(add-after 'install 'remove-cache (add-after 'install 'remove-cache
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(for-each (for-each delete-file
delete-file (find-files #$output "immodules.cache")))))))
(find-files (assoc-ref outputs "out") "immodules.cache"))
#t)))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUIX_GTK2_PATH") (variable "GUIX_GTK2_PATH")