[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: gnu: nss: Use (guix utils).
From: |
guix-commits |
Subject: |
05/05: gnu: nss: Use (guix utils). |
Date: |
Sun, 6 Jun 2021 13:52:54 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit e7f0835b07d868fd447aa64c873174fa385e1699
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jun 6 19:27:16 2021 +0200
gnu: nss: Use (guix utils).
* gnu/packages/nss.scm (nss)[arguments]: Utilize CC-FOR-TARGET and
TARGET-64bit?.
---
gnu/packages/nss.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index c874ce1..73006fe 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -24,6 +24,7 @@
(define-module (gnu packages nss)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:)
@@ -31,8 +32,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages perl)
- #:use-module (gnu packages sqlite)
- #:use-module (ice-9 match))
+ #:use-module (gnu packages sqlite))
(define-public nspr
(package
@@ -121,13 +121,11 @@ in the Mozilla clients.")
(modify-phases %standard-phases
(replace 'configure
(lambda _
- (setenv "CC" "gcc")
+ (setenv "CC" ,(cc-for-target))
;; 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")))
- (_
- '()))))
+ ,@(if (target-64bit?)
+ `((setenv "USE_64" "1"))
+ '())))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?