mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-13 06:36:37 -05:00
gnu: nss: Use (guix utils).
* gnu/packages/nss.scm (nss)[arguments]: Utilize CC-FOR-TARGET and TARGET-64bit?.
This commit is contained in:
parent
79878c64b4
commit
e7f0835b07
1 changed files with 6 additions and 8 deletions
|
@ -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 @@ (define-module (gnu packages nss)
|
|||
#: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 @@ (define-public nss
|
|||
(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?
|
||||
|
|
Loading…
Reference in a new issue