diff options
| author | Arun Isaac | 2026-05-20 02:51:47 +0100 |
|---|---|---|
| committer | Arun Isaac | 2026-05-20 02:53:09 +0100 |
| commit | 00d2dd1a43fd464480090b21e1ed493813633725 (patch) | |
| tree | 2643dd2bd150f86a9bc0326246d97788b83c94c5 | |
| parent | 73ea0f4397ed2efe58dd3e2f11b9fa187fc5497a (diff) | |
| download | kaagum-00d2dd1a43fd464480090b21e1ed493813633725.tar.gz kaagum-00d2dd1a43fd464480090b21e1ed493813633725.tar.lz kaagum-00d2dd1a43fd464480090b21e1ed493813633725.zip | |
Depend on and capture reference to %certificates-directory.
We need an explicit reference to the TLS certificates directory so we can pass it on into our tool call containers.
| -rw-r--r-- | .guix/kaagum-package.scm | 7 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | kaagum/config.scm.in | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/.guix/kaagum-package.scm b/.guix/kaagum-package.scm index 7fa9ac7..68cfed6 100644 --- a/.guix/kaagum-package.scm +++ b/.guix/kaagum-package.scm @@ -23,6 +23,7 @@ #:select (guile-next guile-json-4)) #:use-module ((gnu packages guile-xyz) #:select (guile-lens guile-run64)) + #:use-module ((gnu packages nss) #:select (nss-certs)) #:use-module ((gnu packages package-management) #:select (guix)) #:use-module (guix build-system emacs) @@ -45,7 +46,9 @@ (build-system gnu-build-system) (arguments (list #:make-flags - #~(list (string-append "prefix=" #$output)) + #~(list (string-append "prefix=" #$output) + (string-append "CERTIFICATES_DIRECTORY=" + #$(this-package-input "nss-certs"))) #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) ,@%default-gnu-imported-modules) @@ -73,7 +76,7 @@ effective-version "/site-ccache") ,(getenv "GUILE_LOAD_COMPILED_PATH"))))))))))) (inputs - (list guile-next guile-json-4 guile-lens guix)) + (list guile-next guile-json-4 guile-lens guix nss-certs)) (native-inputs (list guile-run64)) (home-page "https://forge.systemreboot.net/kaagum") diff --git a/Makefile b/Makefile index 588ef56..2a9997d 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ GUILE_RUN64 = guile-run64 LZIP = lzip SED = sed +CERTIFICATES_DIRECTORY = /etc/ssl/certs GUILD_FLAGS = prefix ?= /usr/local @@ -59,7 +60,7 @@ godir = $(libdir)/guile/$(guile_effective_version)/site-ccache all: $(objects) $(config_file) %.scm: %.scm.in - $(SED) -e 's|@PROJECT@|$(project)|' -e 's|@PROJECT_TITLE@|$(project_title)|' -e 's|@VERSION@|$(version)|' $< > $@ + $(SED) -e 's|@PROJECT@|$(project)|' -e 's|@PROJECT_TITLE@|$(project_title)|' -e 's|@VERSION@|$(version)|' -e 's|@CERTIFICATES_DIRECTORY@|$(CERTIFICATES_DIRECTORY)|' $< > $@ %.go: %.scm $(config_file) GUILE_AUTO_COMPILE=0 ./pre-inst-env $(GUILD) compile $(GUILD_FLAGS) -o $@ $< diff --git a/kaagum/config.scm.in b/kaagum/config.scm.in index bfe5f77..a418a04 100644 --- a/kaagum/config.scm.in +++ b/kaagum/config.scm.in @@ -19,7 +19,8 @@ (define-module (kaagum config) #:export (%project %project-title - %version)) + %version + %certificates-directory)) (define %project "@PROJECT@") @@ -29,3 +30,6 @@ (define %version "@VERSION@") + +(define %certificates-directory + "@CERTIFICATES_DIRECTORY@") |