TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: nss: Use (guix utils).

Browse source 
* gnu/packages/nss.scm (nss)[arguments]: Utilize CC-FOR-TARGET and
TARGET-64bit?.
This commit is contained in:
Marius Bakke 2021-06-06 19:27:16 +02:00
parent 79878c64b4
commit e7f0835b07
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/nss.scm
View file

@ -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?