diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/applications/science/math/mathematica/default.nix | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/applications/science/math/mathematica/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/science/math/mathematica/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/science/math/mathematica/default.nix b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix index 94d72eec6ae4..ea9a9c1b7554 100644 --- a/nixpkgs/pkgs/applications/science/math/mathematica/default.nix +++ b/nixpkgs/pkgs/applications/science/math/mathematica/default.nix @@ -3,6 +3,7 @@ , patchelf , requireFile , callPackage +, makeWrapper , alsaLib , dbus , fontconfig @@ -11,7 +12,7 @@ , glib , libssh2 , ncurses -, opencv2 +, opencv4 , openssl , unixODBC , xkeyboard_config @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils patchelf + makeWrapper alsaLib coreutils dbus @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv2 + opencv4 openssl stdenv.cc.cc.lib unixODBC @@ -106,6 +108,9 @@ stdenv.mkDerivation rec { # Remove some broken libraries rm -f $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* + + # Set environment variable to fix libQt errors - see https://github.com/NixOS/nixpkgs/issues/96490 + wrapProgram $out/bin/mathematica --set USE_WOLFRAM_LD_LIBRARY_PATH 1 ''; preFixup = '' @@ -139,6 +144,9 @@ stdenv.mkDerivation rec { ''; dontBuild = true; + + # This is primarily an IO bound build; there's little benefit to building remotely. + preferLocalBuild = true; # all binaries are already stripped dontStrip = true; |