mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 10:16:44 +01:00
ef43cd3d42
There have been significant changes, therefore it doesn't make sense anymore to maintain the python2 and python3 version in the same file. We'll be able to drop the python2 version soon, some time after we have switched sage to python3.
22 lines
802 B
Diff
22 lines
802 B
Diff
diff --git a/rpy2/rinterface_lib/embedded.py b/rpy2/rinterface_lib/embedded.py
|
|
index cc32b6d..3969ad0 100644
|
|
--- a/rpy2/rinterface_lib/embedded.py
|
|
+++ b/rpy2/rinterface_lib/embedded.py
|
|
@@ -113,6 +113,16 @@ def _initr(interactive: bool = True,
|
|
if isinitialized():
|
|
return None
|
|
os.environ['R_HOME'] = openrlib.R_HOME
|
|
+
|
|
+ # path to libraries
|
|
+ existing = os.environ.get('R_LIBS_SITE')
|
|
+ if existing is not None:
|
|
+ prefix = existing + ':'
|
|
+ else:
|
|
+ prefix = ''
|
|
+ additional = '@NIX_R_LIBS_SITE@'
|
|
+ os.environ['R_LIBS_SITE'] = prefix + additional
|
|
+
|
|
options_c = [ffi.new('char[]', o.encode('ASCII')) for o in _options]
|
|
n_options = len(options_c)
|
|
n_options_c = ffi.cast('int', n_options)
|