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

+8 -2
+8 -2
pkgs/applications/science/math/mathematica/generic.nix
··· 56 56 cuda_cudart cuda_nvcc libcublas libcufft libcurand libcusparse 57 57 ]; 58 58 postBuild = '' 59 - ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib 59 + if [ ! -e $out/lib/libcuda.so ]; then 60 + ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib 61 + fi 60 62 ln -s lib $out/lib64 61 63 ''; 62 64 }; ··· 119 121 ]) ++ lib.optional cudaSupport cudaEnv; 120 122 121 123 wrapProgramFlags = [ 122 - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib zlib ]}" 124 + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ 125 + dbus 126 + gcc-unwrapped.lib 127 + zlib 128 + ]}" 123 129 "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" 124 130 # Fix libQt errors - #96490 125 131 "--set USE_WOLFRAM_LD_LIBRARY_PATH 1"