ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: nss: Build for aarch64-linux with 64-bit support."

Browse source 
Temporary revert to fix messy merge conflict!

This reverts commit 568004c3c9.
This commit is contained in:
Marius Bakke 2017-03-15 17:51:23 +01:00
parent 378640ec37
commit adb984d23c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/gnuzilla.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; 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> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -23,7 +23,6 @@
(define-module (gnu packages gnuzilla) (define-module (gnu packages gnuzilla)
#:use-module ((srfi srfi-1) #:hide (zip)) #:use-module ((srfi srfi-1) #:hide (zip))
#:use-module (ice-9 match)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -204,7 +203,7 @@ (define-public nss
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" "bin")) (outputs '("out" "bin"))
(arguments (arguments
`(#:parallel-build? #f ; not supported '(#:parallel-build? #f ; failed
#:make-flags #:make-flags
(let* ((out (assoc-ref %outputs "out")) (let* ((out (assoc-ref %outputs "out"))
(nspr (string-append (assoc-ref %build-inputs "nspr"))) (nspr (string-append (assoc-ref %build-inputs "nspr")))
@ -224,14 +223,11 @@ (define-public nss
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda _ (lambda* (#:key system inputs #:allow-other-keys)
(setenv "CC" "gcc") (setenv "CC" "gcc")
;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system.
,@(match (%current-system) (when (string-prefix? "x86_64" system)
((or "x86_64-linux" "aarch64-linux") (setenv "USE_64" "1"))
`((setenv "USE_64" "1")))
(_
'()))
#t)) #t))
(replace 'check (replace 'check
(lambda _ (lambda _