nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

* gnu/packages/gnuzilla.scm (nss)[arguments]: Use 'modify-phases'.
This commit is contained in:
Marius Bakke 2017-03-05 15:13:46 +01:00
parent 4b7e5c1131
commit db3c06d511
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/gnuzilla.scm
View File

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