guix_mirror_bot pushed a commit to branch nss-updates
in repository guix.
commit d3c9b6fdb726e146b04a33ffdba2dc2294ebe33d
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Thu May 22 09:50:55 2025 +0900
gnu: nss: Use gexp variables in install phase.
* gnu/packages/nss.scm (nss) [#:phases]: Use gexp variables in install
phase.
Change-Id: I16d9d31669d30ae0a9171f677525470152bab07d
---
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 8fc0c1dbad..f2f5c40f59 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -231,25 +231,23 @@ in the Mozilla clients.")
#$%nss-release-date "./nss/tests/all.sh"))
(format #t "test suite not run~%"))))
(replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append (assoc-ref outputs "bin") "/bin"))
- (inc (string-append out "/include/nss"))
- (lib (string-append out "/lib/nss"))
+ (lambda _
+ (let* ((inc (string-append #$output "/include/nss"))
+ (lib (string-append #$output "/lib/nss"))
(obj (match (scandir "dist" (cut string-suffix? "OBJ" <>))
((obj) (string-append "dist/" obj)))))
;; Install nss-config to $out/bin.
(install-file (string-append obj "/bin/nss-config")
- (string-append out "/bin"))
+ (string-append #$output "/bin"))
(delete-file (string-append obj "/bin/nss-config"))
;; Install nss.pc to $out/lib/pkgconfig.
(install-file (string-append obj "/lib/pkgconfig/nss.pc")
- (string-append out "/lib/pkgconfig"))
+ (string-append #$output "/lib/pkgconfig"))
(delete-file (string-append obj "/lib/pkgconfig/nss.pc"))
(rmdir (string-append obj "/lib/pkgconfig"))
;; Install other files.
(copy-recursively "dist/public/nss" inc)
- (copy-recursively (string-append obj "/bin") bin)
+ (copy-recursively (string-append obj "/bin") #$output:bin)
(copy-recursively (string-append obj "/lib") lib)))))))
(inputs (list sqlite zlib))
(propagated-inputs (list nspr)) ;required by nss.pc.
