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/sway.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'profiles/sway.py') diff --git a/profiles/sway.py b/profiles/sway.py index 9afc047d..b0ff8c19 100644 --- a/profiles/sway.py +++ b/profiles/sway.py @@ -25,7 +25,7 @@ def _prep_function(*args, **kwargs): other code in this stage. So it's a safe way to ask the user for more input before any other installer steps start. """ - __builtins__["_gfx_driver_packages"] = archinstall.select_driver() + archinstall.storage["gfx_driver_packages"] = archinstall.select_driver() return True @@ -34,7 +34,7 @@ def _prep_function(*args, **kwargs): # through importlib.util.spec_from_file_location("sway", "/somewhere/sway.py") # or through conventional import sway if __name__ == "sway": - if "nvidia" in _gfx_driver_packages: + if "nvidia" in archinstall.storage.get("gfx_driver_packages", None): choice = input("The proprietary Nvidia driver is not supported by Sway. It is likely that you will run into issues. Continue anyways? [y/N] ") if choice.lower() in ("n", ""): raise archinstall.lib.exceptions.HardwareIncompatibilityError("Sway does not support the proprietary nvidia drivers.") @@ -43,4 +43,4 @@ if __name__ == "sway": archinstall.storage['installation_session'].add_additional_packages(__packages__) # Install the graphics driver packages - archinstall.storage['installation_session'].add_additional_packages(_gfx_driver_packages) + archinstall.storage['installation_session'].add_additional_packages(f"xorg-server xorg-xinit {' '.join(archinstall.storage.get('gfx_driver_packages', None))}") -- cgit v1.2.3-70-g09d2