From 2aed8c6ad5a8ab31accb6d618bca4798591cf415 Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Mon, 24 May 2021 19:23:08 +0530 Subject: removed builtins usage and added gfx_package key in config --- profiles/xorg.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'profiles/xorg.py') diff --git a/profiles/xorg.py b/profiles/xorg.py index b8fb2cbb..9006a430 100644 --- a/profiles/xorg.py +++ b/profiles/xorg.py @@ -22,7 +22,7 @@ def _prep_function(*args, **kwargs): for more input before any other installer steps start. """ - __builtins__['_gfx_driver_packages'] = archinstall.select_driver() + archinstall.storage["gfx_driver_packages"] = archinstall.select_driver() # TODO: Add language section and/or merge it with the locale selected # earlier in for instance guided.py installer. @@ -35,13 +35,13 @@ def _prep_function(*args, **kwargs): # or through conventional import xorg if __name__ == 'xorg': try: - if "nvidia" in _gfx_driver_packages: + if "nvidia" in archinstall.storage.get("gfx_driver_packages", None): if "linux-zen" in archinstall.storage['installation_session'].base_packages or "linux-lts" in archinstall.storage['installation_session'].base_packages: 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") else: - archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(_gfx_driver_packages)}") + archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', None))}") else: - archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(_gfx_driver_packages)}") + archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', None))}") except: archinstall.storage['installation_session'].add_additional_packages("xorg-server xorg-xinit") # Prep didn't run, so there's no driver to install -- cgit v1.2.3-54-g00ecf