diff options
author | Marius Bakke <marius@gnu.org> | 2022-09-16 18:52:30 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-09-16 19:03:43 +0200 |
commit | cc562eb47c19bc83e282a09316718d10c3bf9965 (patch) | |
tree | 493219cf478a97ec56ff7b0ebcd8d0f380e48be3 /gnu/packages/glib.scm | |
parent | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (diff) | |
download | guix-cc562eb47c19bc83e282a09316718d10c3bf9965.tar.gz guix-cc562eb47c19bc83e282a09316718d10c3bf9965.zip |
gnu: glib-next: Use G-expression.
* gnu/packages/glib.scm (glib-next)[arguments]: Use gexp.
Diffstat (limited to 'gnu/packages/glib.scm')
-rw-r--r-- | gnu/packages/glib.scm | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 7d3cdc7877..db24a0466a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -397,35 +397,35 @@ functions for strings and common data structures.") ((#:test-options test-options ''()) ;; Skip flaky or slow tests. `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options)) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (replace 'disable-failing-tests - (lambda _ - (with-directory-excursion "glib/tests" - (substitute* '("unix.c" "utils.c") - (("[ \t]*g_test_add_func.*;") ""))) - ;; The "glib:gio / file" test fails with the error "No - ;; application is registered as handling this file" (see: - ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). - (with-directory-excursion "gio/tests" - (substitute* '("appinfo.c" - "contenttype.c" - "desktop-app-info.c" - "file.c" - "gdbus-address-get-session.c" - "gdbus-peer.c") - (("[ \t]*g_test_add_func.*;") ""))) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'disable-failing-tests + (lambda _ + (with-directory-excursion "glib/tests" + (substitute* '("unix.c" "utils.c") + (("[ \t]*g_test_add_func.*;") ""))) + ;; The "glib:gio / file" test fails with the error "No + ;; application is registered as handling this file" (see: + ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). + (with-directory-excursion "gio/tests" + (substitute* '("appinfo.c" + "contenttype.c" + "desktop-app-info.c" + "file.c" + "gdbus-address-get-session.c" + "gdbus-peer.c") + (("[ \t]*g_test_add_func.*;") ""))) - ,@(if (target-x86-32?) - ;; Comment out parts of timer.c that fail on i686 due to - ;; excess precision when building with GCC 10: - ;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>. - '((substitute* "glib/tests/timer.c" - (("^ g_assert_cmpuint \\(micros.*" all) - (string-append "//" all "\n")) - (("^ g_assert_cmpfloat \\(elapsed, ==.*" all) - (string-append "//" all "\n")))) - '()))))))) + #$@(if (target-x86-32?) + ;; Comment out parts of timer.c that fail on i686 due to + ;; excess precision when building with GCC 10: + ;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>. + '((substitute* "glib/tests/timer.c" + (("^ g_assert_cmpuint \\(micros.*" all) + (string-append "//" all "\n")) + (("^ g_assert_cmpfloat \\(elapsed, ==.*" all) + (string-append "//" all "\n")))) + '()))))))) (native-inputs (modify-inputs (package-native-inputs glib) (append desktop-file-utils))) |