From 999893bdad413580d26f2a2188e71f71e7161158 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Wed, 19 Aug 2015 13:18:17 +0200
Subject: [PATCH] Fix travis build
---
setup.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index 9155890c..f3fe811a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ if sys.platform == "win32":
for path in QtCore.QCoreApplication.libraryPaths():
if os.path.isfile(os.path.join(os.path.dirname(path), "libEGL.dll")):
libEGL_path = os.path.join(os.path.dirname(path), "libEGL.dll")
-
+
if 'CONDA_ENV_PATH' in os.environ:
# Check if we are in Conda env
path = QtCore.QCoreApplication.libraryPaths()[0]
@@ -54,8 +54,7 @@ else:
print(QtCore.QCoreApplication.libraryPaths())
# Check if we are in Conda env
if 'CONDA_ENV_PATH' in os.environ:
- libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], 'envs',
- os.environ['CONDA_DEFAULT_ENV'], "lib",
+ libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib",
"libsodium.so.13")
includefiles.append((libsodium_path, "libsodium.so.13"))
--
GitLab