Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/profiles/xorg.py
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/xorg.py')
-rw-r--r--profiles/xorg.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/profiles/xorg.py b/profiles/xorg.py
index 2ce8dcc2..de45acd3 100644
--- a/profiles/xorg.py
+++ b/profiles/xorg.py
@@ -47,9 +47,9 @@ if __name__ == 'xorg':
for kernel in archinstall.storage['installation_session'].kernels:
archinstall.storage['installation_session'].add_additional_packages(f"{kernel}-headers") # Fixes https://github.com/archlinux/archinstall/issues/585
archinstall.storage['installation_session'].add_additional_packages("dkms") # I've had kernel regen fail if it wasn't installed before nvidia-dkms
- archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit nvidia-dkms")
+ archinstall.storage['installation_session'].add_additional_packages("xorg-server", "xorg-xinit", "nvidia-dkms")
else:
- archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', []))}")
+ archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', []))
elif 'amdgpu' in archinstall.storage.get("gfx_driver_packages", []):
# The order of these two are important if amdgpu is installed #808
if 'amdgpu' in archinstall.storage['installation_session'].MODULES:
@@ -60,9 +60,9 @@ if __name__ == 'xorg':
archinstall.storage['installation_session'].MODULES.remove('radeon')
archinstall.storage['installation_session'].MODULES.append('radeon')
- archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', []))}")
+ archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', []))
else:
- archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', []))}")
+ archinstall.storage['installation_session'].add_additional_packages(f"xorg-server", "xorg-xinit", *archinstall.storage.get('gfx_driver_packages', []))
except Exception as err:
archinstall.log(f"Could not handle nvidia and linuz-zen specific situations during xorg installation: {err}", level=logging.WARNING, fg="yellow")
- archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit") # Prep didn't run, so there's no driver to install
+ archinstall.storage['installation_session'].add_additional_packages("xorg-server", "xorg-xinit") # Prep didn't run, so there's no driver to install