ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-14 23:20:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glib-next: Use G-expression.

Browse source 
* gnu/packages/glib.scm (glib-next)[arguments]: Use gexp.
This commit is contained in:
Marius Bakke 2022-09-16 18:52:30 +02:00
parent 4920f6e634
commit cc562eb47c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
gnu/packages/glib.scm
View file

@ -397,35 +397,35 @@ (define-public glib-next
((#:test-options test-options ''()) ((#:test-options test-options ''())
;; Skip flaky or slow tests. ;; Skip flaky or slow tests.
`(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options)) `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options))
((#:phases phases '%standard-phases) ((#:phases phases #~%standard-phases)
`(modify-phases ,phases #~(modify-phases #$phases
(replace 'disable-failing-tests (replace 'disable-failing-tests
(lambda _ (lambda _
(with-directory-excursion "glib/tests" (with-directory-excursion "glib/tests"
(substitute* '("unix.c" "utils.c") (substitute* '("unix.c" "utils.c")
(("[ \t]*g_test_add_func.*;") ""))) (("[ \t]*g_test_add_func.*;") "")))
;; The "glib:gio / file" test fails with the error "No ;; The "glib:gio / file" test fails with the error "No
;; application is registered as handling this file" (see: ;; application is registered as handling this file" (see:
;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742).
(with-directory-excursion "gio/tests" (with-directory-excursion "gio/tests"
(substitute* '("appinfo.c" (substitute* '("appinfo.c"
"contenttype.c" "contenttype.c"
"desktop-app-info.c" "desktop-app-info.c"
"file.c" "file.c"
"gdbus-address-get-session.c" "gdbus-address-get-session.c"
"gdbus-peer.c") "gdbus-peer.c")
(("[ \t]*g_test_add_func.*;") ""))) (("[ \t]*g_test_add_func.*;") "")))
,@(if (target-x86-32?) #$@(if (target-x86-32?)
;; Comment out parts of timer.c that fail on i686 due to ;; Comment out parts of timer.c that fail on i686 due to
;; excess precision when building with GCC 10: ;; excess precision when building with GCC 10:
;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>. ;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>.
'((substitute* "glib/tests/timer.c" '((substitute* "glib/tests/timer.c"
(("^ g_assert_cmpuint \\(micros.*" all) (("^ g_assert_cmpuint \\(micros.*" all)
(string-append "//" all "\n")) (string-append "//" all "\n"))
(("^ g_assert_cmpfloat \\(elapsed, ==.*" all) (("^ g_assert_cmpfloat \\(elapsed, ==.*" all)
(string-append "//" all "\n")))) (string-append "//" all "\n"))))
'()))))))) '())))))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs glib) (modify-inputs (package-native-inputs glib)
(append desktop-file-utils))) (append desktop-file-utils)))