Skip to content
Snippets Groups Projects
Commit dc1dd3fb authored by inso's avatar inso
Browse files

Include libsodium

parent a252de97
No related branches found
No related tags found
No related merge requests found
......@@ -61,11 +61,18 @@ else:
for f in onlyfiles:
zipincludes.append((os.path.join(schemas, f), os.path.join("jsonschema", "schemas", f)))
# Check if we are in Conda env
if 'CONDA_ENV_PATH' in os.environ:
libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib",
"libsodium.so.13")
includefiles.append((libsodium_path, "libsodium.so.13"))
if sys.platform == "darwin":
info = subprocess.check_output(["brew", "info", "libsodium"])
info = info.decode().splitlines(keepends=False)
if len(info) > 1:
library_path = info[3].split(" ")[0]
libsodium_path = os.path.join(library_path, "lib",
"libsodium.dylib")
includefiles.append(libsodium_path)
print(libsodium_path)
else:
print("Erreur : libsodium not found. Please install it with brew install libsodium.")
print("Includes : ")
......
......@@ -24,6 +24,7 @@ class ImportAccountDialog(QDialog, Ui_ImportAccountDialog):
self.setupUi(self)
self.app = app
self.main_window = parent
self.selected_file = ""
self.button_box.button(QDialogButtonBox.Ok).setEnabled(False)
def accept(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment