diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:51:23 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-15 17:51:23 +0100 |
| commit | adb984d23c003d5d48ada47bf5ad8105a3b8e412 (patch) | |
| tree | 91ead25ea16a13b3a95486da3bc07721d6cfb96f | |
| parent | 378640ec37301de84f0ac7183aa88c52b25338c1 (diff) | |
| download | patches-adb984d23c003d5d48ada47bf5ad8105a3b8e412.tar patches-adb984d23c003d5d48ada47bf5ad8105a3b8e412.tar.gz | |
Revert "gnu: nss: Build for aarch64-linux with 64-bit support."
Temporary revert to fix messy merge conflict!
This reverts commit 568004c3c9a87b95d4e19a3187f336a20d33440a.
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 79bf103306..55dfda4948 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, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; ;;; This file is part of GNU Guix. @@ -23,7 +23,6 @@ (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) @@ -204,7 +203,7 @@ in the Mozilla clients.") (build-system gnu-build-system) (outputs '("out" "bin")) (arguments - `(#:parallel-build? #f ; not supported + '(#:parallel-build? #f ; failed #:make-flags (let* ((out (assoc-ref %outputs "out")) (nspr (string-append (assoc-ref %build-inputs "nspr"))) @@ -224,14 +223,11 @@ in the Mozilla clients.") #:phases (modify-phases %standard-phases (replace 'configure - (lambda _ + (lambda* (#:key system inputs #:allow-other-keys) (setenv "CC" "gcc") ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. - ,@(match (%current-system) - ((or "x86_64-linux" "aarch64-linux") - `((setenv "USE_64" "1"))) - (_ - '())) + (when (string-prefix? "x86_64" system) + (setenv "USE_64" "1")) #t)) (replace 'check (lambda _ |