1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-21 21:52:03 +02:00

build: Use the new --symlink option instead of --expose.

Instead of leaking host TLS certificates at /etc/ssl/certs for GnuTLS,
we can now have the directory symlinked to the ones provided by the
nss-certs package in the Guix container, which is cleaner.

* extras/packaging/gnu-linux/Makefile
(portable-release-tarball): Replace --expose options with --symlink.
* build.py (run_install): Likewise.

Change-Id: Id3b8c2b3dd06fade10bbd280fd0af8f9ac8fde45
This commit is contained in:
Maxim Cournoyer 2023-02-20 21:59:28 -05:00 committed by Sébastien Blin
parent 8a15f18d1c
commit 0bf99a8fee
2 changed files with 5 additions and 7 deletions

View file

@ -406,11 +406,9 @@ def run_install(args):
print('info: consider setting the TARBALLS environment variable '
'to a stable writable location to avoid loosing '
'cached tarballs')
# Note: we must expose /gnu/store because /etc/ssl/certs
# contains certs that are symlinks to store items.
command = ['guix', 'shell', '--manifest=guix/manifest.scm',
'--expose=/gnu/store', '--expose=/etc/ssl/certs',
'--expose=/usr/bin/env',
'--symlink=/usr/bin/env=bin/env',
'--symlink=/etc/ssl/certs=etc/ssl/certs',
'--container', '--network'] + share_tarballs_args \
+ ['--'] + command

View file

@ -98,9 +98,9 @@ guix-share-tarball-arg = $${TARBALLS:+"--share=$$TARBALLS"}
portable-release-tarball: has-guix-p
guix shell --container --network \
--preserve=TARBALLS $(guix-share-tarball-arg) \
--expose=/usr/bin/env \
--expose=$$SSL_CERT_DIR=/etc/ssl/certs \
--manifest=$(CURDIR)/extras/packaging/gnu-linux/guix/minimal-manifest.scm \
--symlink=/usr/bin/env=bin/env \
--symlink=/etc/ssl/certs=etc/ssl/certs \
--manifest=extras/packaging/gnu-linux/guix/minimal-manifest.scm \
-- $(MAKE) -f extras/packaging/gnu-linux/Makefile release-tarball
daemon/contrib/native/Makefile: