diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:53:27 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:53:27 +0100 |
| commit | 1461dd241000b44f03733fe9fd2f13ba4463ed28 (patch) | |
| tree | 22d1d94e854b1d22c213b824dcf4e800cfe0286b | |
| parent | db3c06d511a47f653a87de82c0c7c0739033932d (diff) | |
| download | guix-1461dd241000b44f03733fe9fd2f13ba4463ed28.tar.gz guix-1461dd241000b44f03733fe9fd2f13ba4463ed28.zip | |
Revert "Revert "gnu: nss: Build for aarch64-linux with 64-bit support.""
This reverts commit adb984d23c003d5d48ada47bf5ad8105a3b8e412.
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e11e831cbe..afb5ad3061 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; ;;; This file is part of GNU Guix. @@ -23,6 +23,7 @@ (define-module (gnu packages gnuzilla) #:use-module ((srfi srfi-1) #:hide (zip)) + #:use-module (ice-9 match) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -203,7 +204,7 @@ in the Mozilla clients.") (build-system gnu-build-system) (outputs '("out" "bin")) (arguments - '(#:parallel-build? #f ; failed + `(#:parallel-build? #f ; not supported #:make-flags (let* ((out (assoc-ref %outputs "out")) (nspr (string-append (assoc-ref %build-inputs "nspr"))) @@ -223,11 +224,14 @@ in the Mozilla clients.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key system inputs #:allow-other-keys) + (lambda _ (setenv "CC" "gcc") ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. - (when (string-prefix? "x86_64" system) - (setenv "USE_64" "1")) + ,@(match (%current-system) + ((or "x86_64-linux" "aarch64-linux") + `((setenv "USE_64" "1"))) + (_ + '())) #t)) (replace 'check (lambda _ |