summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2025-05-22 09:50:55 +0900
committerIan Eure <ian@retrospec.tv>2025-06-24 06:34:03 -0700
commitc1d73491b14e30da9cca45431067ba898952efc0 (patch)
treeb4694c162bfd884d407cd05e82c7502456bbae4d
parentd31d601e1ce519a00297c503eccc1ff031d9d915 (diff)
gnu: nss: Use gexp variables in install phase.
* gnu/packages/nss.scm (nss) [#:phases]: Use gexp variables in install phase. Change-Id: I16d9d31669d30ae0a9171f677525470152bab07d
-rw-r--r--gnu/packages/nss.scm14
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index b9ffda6fd7..7e4052b0b9 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -234,25 +234,23 @@ in the Mozilla clients.")
"2024-01-23" "./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.