From dc1dd3fb59dfb395022a484741987278a9823918 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Sat, 19 Dec 2015 21:46:22 +0100
Subject: [PATCH] Include libsodium
---
setup.py | 17 ++++++++++++-----
src/sakia/gui/import_account.py | 1 +
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/setup.py b/setup.py
index f592b045..04faa9ea 100644
--- a/setup.py
+++ b/setup.py
@@ -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 : ")
diff --git a/src/sakia/gui/import_account.py b/src/sakia/gui/import_account.py
index 0a453fc0..a7ee0dbb 100644
--- a/src/sakia/gui/import_account.py
+++ b/src/sakia/gui/import_account.py
@@ -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):
--
GitLab