mathematica: minor fixes
This change includes two fixes: 1. add the directory containing dbus' libraries to LD_LIBRARY_PATH (#284736) 2. avoid creating conflicting `libcuda.so` in the CUDA environment
This commit is contained in:
parent
4f301350da
commit
446a6771a6
1 changed files with 8 additions and 2 deletions
|
@ -56,7 +56,9 @@ let cudaEnv = symlinkJoin {
|
|||
cuda_cudart cuda_nvcc libcublas libcufft libcurand libcusparse
|
||||
];
|
||||
postBuild = ''
|
||||
if [ ! -e $out/lib/libcuda.so ]; then
|
||||
ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib
|
||||
fi
|
||||
ln -s lib $out/lib64
|
||||
'';
|
||||
};
|
||||
|
@ -119,7 +121,11 @@ in stdenv.mkDerivation {
|
|||
]) ++ lib.optional cudaSupport cudaEnv;
|
||||
|
||||
wrapProgramFlags = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib zlib ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
dbus
|
||||
gcc-unwrapped.lib
|
||||
zlib
|
||||
]}"
|
||||
"--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}"
|
||||
# Fix libQt errors - #96490
|
||||
"--set USE_WOLFRAM_LD_LIBRARY_PATH 1"
|
||||
|
|
Loading…
Reference in a new issue