diff options
| author | Leo Famulari <leo@famulari.name> | 2017-04-25 14:27:03 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-04-25 14:27:03 -0400 |
| commit | 39d2d9a7abdde28830c39c1128986cad539c081d (patch) | |
| tree | 980846ee567066b80e259e35bd1f39c388db583c /gnu/packages/gnuzilla.scm | |
| parent | 803067939718be1c17a40fa33a75eb65a3cece2f (diff) | |
| parent | 31c374e0816fc183e177d93257f90b3c02d517af (diff) | |
| download | guix-patches-39d2d9a7abdde28830c39c1128986cad539c081d.tar guix-patches-39d2d9a7abdde28830c39c1128986cad539c081d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index efe63adb4d..d60b53828b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -241,6 +241,16 @@ in the Mozilla clients.") `((setenv "USE_64" "1"))) (_ '())) + ;; The timeout values in "increase-test-timeouts" are still + ;; too low, so apply this workaround on armhf for now to avoid + ;; rebuilding on all platforms. This should be incorporated in + ;; the patch for the next update. + ;; https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00472.html + ,@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) + `((substitute* "nss/gtests/ssl_gtest/tls_connect.cc" + (("25000\\);") "300000);"))) + '()) #t)) (replace 'check (lambda _ |