diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-21 23:44:54 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-21 23:44:54 +0100 |
| commit | 119fd58922b00d43d4f8b055f3f622478a13f46d (patch) | |
| tree | 4869f9f09079d5a33f7dfd51ca8e52200fbeb09f /gnu/packages/glib.scm | |
| parent | 85ba5e9335207beef9a650e96d5d64787beb9256 (diff) | |
| parent | bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (diff) | |
Merge branch 'ungrafting' into staging
Diffstat (limited to 'gnu/packages/glib.scm')
| -rw-r--r-- | gnu/packages/glib.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a37369c49a..9cc2b1b69e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -227,6 +227,17 @@ shared NFS home directories.") (("gio-launch-desktop") (string-append out "/libexec/gio-launch-desktop"))) #t))) + ;; TODO: Remove the conditional in the next core-updates cycle. + ;; Needed to build glib on slower ARM nodes. + ,@(if (string-prefix? "arm" (%current-system)) + `((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "meson.build" + (("test_timeout = 60") + "test_timeout = 90") + (("test_timeout_slow = 120") + "test_timeout_slow = 180"))))) + '()) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. @@ -444,7 +455,9 @@ dynamic loading, and an object system.") ("python" ,python-wrapper) ("zlib" ,zlib))) (propagated-inputs - `(("libffi" ,libffi))) + `(;; In practice, GIR users will need libffi when using + ;; gobject-introspection. + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification |