mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-04-22 06:02:03 +02:00
build.py: Fix building with Guix.
The manifest has moved from guix/manifest to extras/packaging/gnu-linux/guix/manifest.scm; adjust the script for it. * build.py (GUIX_MANIFEST): New variable. (run_dependencies, run_install, main): Use it. Change-Id: Ic2adf89be1eb21c672d8d8950ea6bbf93f5a2773
This commit is contained in:
parent
0c9499910c
commit
8832f40b19
1 changed files with 6 additions and 4 deletions
10
build.py
10
build.py
|
@ -212,6 +212,8 @@ UNINSTALL_DAEMON_SCRIPT = [
|
|||
ASSUME_YES_FLAG = ' -y'
|
||||
ASSUME_YES_FLAG_PACMAN = ' --noconfirm'
|
||||
|
||||
GUIX_MANIFEST = 'extras/packaging/gnu-linux/guix/manifest.scm'
|
||||
|
||||
|
||||
def run_powershell_cmd(cmd):
|
||||
p = subprocess.Popen(["powershell.exe", cmd], stdout=sys.stdout)
|
||||
|
@ -293,8 +295,8 @@ def run_dependencies(args):
|
|||
print("The win32 version does not install dependencies with this script.\nPlease continue with the --install instruction.")
|
||||
sys.exit(1)
|
||||
elif args.distribution == 'guix':
|
||||
print("Building the profile defined in 'guix/manifest.scm'...")
|
||||
execute_script(['guix shell --manifest=guix/manifest.scm -- true'])
|
||||
print(f"Building the profile defined in '{GUIX_MANIFEST}'...")
|
||||
execute_script([f'guix shell --manifest={GUIX_MANIFEST} -- true'])
|
||||
|
||||
else:
|
||||
print("Not yet implemented for current distribution (%s). Please continue with the --install instruction. Note: You may need to install some dependencies manually." %
|
||||
|
@ -406,7 +408,7 @@ def run_install(args):
|
|||
print('info: consider setting the TARBALLS environment variable '
|
||||
'to a stable writable location to avoid loosing '
|
||||
'cached tarballs')
|
||||
command = ['guix', 'shell', '--manifest=guix/manifest.scm',
|
||||
command = ['guix', 'shell', f'--manifest={GUIX_MANIFEST}',
|
||||
'--symlink=/usr/bin/env=bin/env',
|
||||
'--symlink=/etc/ssl/certs=etc/ssl/certs',
|
||||
'--container', '--network'] + share_tarballs_args \
|
||||
|
@ -665,7 +667,7 @@ def main():
|
|||
guix_args = ['shell', '--pure',
|
||||
# to allow pulseaudio to connect to an existing server
|
||||
"-E", "XAUTHORITY", "-E", "XDG_RUNTIME_DIR",
|
||||
'--manifest=guix/manifest.scm', '--']
|
||||
f'--manifest={GUIX_MANIFEST}', '--']
|
||||
args = sys.argv + ['--distribution=guix']
|
||||
print('Running in a guix shell spawned with: guix {}'
|
||||
.format(str.join(' ', guix_args + args)))
|
||||
|
|
Loading…
Add table
Reference in a new issue