me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
* 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
1 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
gnu/packages/gtk.scm
View file

@ -906,47 +906,43 @@ 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
#:configure-flags #:parallel-tests? #f
(list "--with-xinput=yes" #:configure-flags
(string-append "--with-html-dir=" #~(list "--with-xinput=yes"
(assoc-ref %outputs "doc") (string-append "--with-html-dir=" #$output
"/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"
(("aliasfilescheck\\.sh") "")) (("aliasfilescheck\\.sh") ""))
(substitute* "gtk/tests/recentmanager.c" (substitute* "gtk/tests/recentmanager.c"
(("g_test_add_func \\(\"/recent-manager.*;") "")) (("g_test_add_func \\(\"/recent-manager.*;") ""))
(substitute* "gtk/tests/defaultvalue.c" (substitute* "gtk/tests/defaultvalue.c"
(("return g_test_run\\(\\);") "")) (("return g_test_run\\(\\);") ""))
;; These require XPM support in Gdk-Pixbuf which is obsolete. ;; These require XPM support in Gdk-Pixbuf which is obsolete.
(substitute* "gtk/tests/textbuffer.c" (substitute* "gtk/tests/textbuffer.c"
(("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. (system "Xvfb :1 +extension GLX &")
(system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1")
(setenv "DISPLAY" ":1") ;; Tests write to $HOME.
;; Tests write to $HOME. (setenv "HOME" (getcwd))
(setenv "HOME" (getcwd)) ;; 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") (add-after 'install 'remove-cache
#t)) (lambda _
(add-after 'install 'remove-cache (for-each delete-file
(lambda* (#:key outputs #:allow-other-keys) (find-files #$output "immodules.cache")))))))
(for-each
delete-file
(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")