diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:31:09 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-06-01 12:42:04 +0300 |
| commit | 64c043e63a4be97f59fd1906c47973a74eedda67 (patch) | |
| tree | 37b15dfb4830e4f874edca87b521b6e9cdc3c81b /gnu/packages/nss.scm | |
| parent | b1f763de54dc2b8e240d0f01f7948ce76f67243e (diff) | |
| parent | 75af73e1b7ac58770122d8831faa3a8158638bb0 (diff) | |
| download | guix-64c043e63a4be97f59fd1906c47973a74eedda67.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/nss.scm')
| -rw-r--r-- | gnu/packages/nss.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index aae8886095..5e719ad5b8 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2021 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> @@ -144,6 +144,11 @@ in the Mozilla clients.") (list "-C" "nss" (string-append "PREFIX=" out) "NSDISTMODE=copy" "NSS_USE_SYSTEM_SQLITE=1" + ;; The gtests fail to compile on riscv64. + ;; Skipping them doesn't affect the test suite. + ,@(if (target-riscv64?) + `("NSS_DISABLE_GTESTS=1") + '()) (string-append "NSPR_INCLUDE_DIR=" nspr "/include/nspr") ;; Add $out/lib/nss to RPATH. (string-append "RPATH=" rpath) @@ -153,6 +158,9 @@ in the Mozilla clients.") (ice-9 ftw) (ice-9 match) (srfi srfi-26)) + #:tests? ,(not (or (%current-target-system) + ;; Tests take more than 30 hours on riscv64-linux. + (target-riscv64?))) #:phases (modify-phases %standard-phases (replace 'configure |