diff options
| author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2024-02-04 10:14:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-04 10:14:33 +0100 |
| commit | bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13 (patch) | |
| tree | a10fa708b5455c94690fafcf03dc578e7aa3a78e /pkgs/applications/science | |
| parent | 26a4aed04821c152416f55ea32f5da3569b1a0c5 (diff) | |
| parent | 446a6771a60a44d39fb832ea206ad1b2fef1757d (diff) | |
| download | nixlib-bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13.tar nixlib-bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13.tar.gz nixlib-bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13.tar.bz2 nixlib-bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13.tar.lz nixlib-bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13.tar.xz nixlib-bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13.tar.zst nixlib-bfda12002ae7cfe56bb5c3f77fc97b07d60ddc13.zip | |
Merge pull request #285982 from herberteuler/fix/284736-mathematica
mathematica: minor fixes
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/mathematica/generic.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 5064a3ddbdf4..5a96bf1a2625 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -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" |