mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-20 06:37:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: nss: Use 'modify-phases' syntax."

Browse source 
This reverts commit 87f1c7efc1.
This commit is contained in:
Marius Bakke 2017-03-14 22:25:55 +01:00
parent 031349075a
commit 796d2f2d0b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 47 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/gnuzilla.scm
View file

@ -221,23 +221,25 @@ (define-public nss
(ice-9 match)
(srfi srfi-26))
#:phases
(modify-phases %standard-phases
(replace 'configure
(alist-replace
'configure
(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.
(when (string-prefix? "x86_64" system)
(setenv "USE_64" "1"))
#t))
(replace 'check
#t)
(alist-replace
'check
(lambda _
;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for testing.
;; The later requires a working DNS or /etc/hosts.
(setenv "DOMSUF" "(none)")
(setenv "USE_IP" "TRUE")
(setenv "IP_ADDRESS" "127.0.0.1")
(zero? (system* "./nss/tests/all.sh"))))
(replace 'install
(zero? (system* "./nss/tests/all.sh")))
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append (assoc-ref outputs "bin") "/bin"))
@ -266,7 +268,8 @@ (define-public nss
;; seems to be used only during the tests.
(delete-file (string-append lib "/libgtest1.so"))
#t))))))
#t))
%standard-phases)))))
(inputs
`(("sqlite" ,sqlite)
("zlib" ,zlib)))