aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-07 16:40:20 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-07 16:40:20 -0700
commitdb54c81e9f376cc717a296bf2af0661abf1bc527 (patch)
tree7312cf336632325b4a76f4391212a9546b973783
parentad7a05152c114ad602fe2a38d447014d507407ec (diff)
parente162e26c30224137cdf0d65d0c1c0498e2c7ff41 (diff)
downloadcryptography-db54c81e9f376cc717a296bf2af0661abf1bc527.tar.gz
cryptography-db54c81e9f376cc717a296bf2af0661abf1bc527.tar.bz2
cryptography-db54c81e9f376cc717a296bf2af0661abf1bc527.zip
Merge pull request #1021 from dreid/conda-linux
Fix #1020 - Add conda instructions for linux.
-rw-r--r--docs/installation.rst12
1 files changed, 10 insertions, 2 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index e2b35898..1efe1af5 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -128,13 +128,21 @@ Building cryptography with conda
--------------------------------
Because of a `bug in conda`_, attempting to install cryptography out of the box
-will result in an error. This can be resolved by setting the
-``DYLD_LIBRARY_PATH`` environment variable:
+will result in an error. This can be resolved by setting the library path
+environment variable for your platform.
+
+On OS X:
.. code-block:: console
$ env DYLD_LIBRARY_PATH="$HOME/anaconda/lib" pip install cryptography
+and on Linux:
+
+.. code-block:: console
+
+ $ env LD_LIBRARY_PATH="$HOME/anaconda/lib" pip install cryptography
+
You will need to set this variable every time you start Python. For more
information, consult `Greg Wilson's blog post`_ on the subject.