colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mathematica: minor fixes

Browse Source 
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:
Guanpeng Xu 2024-02-02 23:20:29 -08:00
parent 4f301350da
commit 446a6771a6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/science/math/mathematica/generic.nix
View File

@ -56,7 +56,9 @@ let cudaEnv = symlinkJoin {
cuda_cudart cuda_nvcc libcublas libcufft libcurand libcusparse
];
postBuild = ''
ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib
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"