From d2702c915fce87a14db944e85105f958a0b49e2c Mon Sep 17 00:00:00 2001 From: Guanpeng Xu Date: Sun, 29 Mar 2020 20:03:53 +0800 Subject: [PATCH] mathematica: 12.0.0 -> 12.1.0 --- pkgs/applications/science/math/mathematica/default.nix | 7 +++++-- pkgs/applications/science/math/mathematica/l10ns.nix | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 7cd1b2eb99fa..5553bb0505fa 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -9,6 +9,7 @@ , freetype , gcc , glib +, libssh2 , ncurses , opencv , openssl @@ -44,9 +45,11 @@ stdenv.mkDerivation rec { gcc.cc gcc.libc glib + libssh2 ncurses opencv openssl + stdenv.cc.cc.lib unixODBC xkeyboard_config libxml2 @@ -93,7 +96,7 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/Mathematica/Executables for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do - sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path + sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}\n" $path done # Fix xkeyboard config path for Qt @@ -102,7 +105,7 @@ stdenv.mkDerivation rec { done # Remove some broken libraries - rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* + rm -f $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* ''; preFixup = '' diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 51fb489be7ec..c75c91be059c 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -7,6 +7,12 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "12.1.0"; + lang = "en"; + language = "English"; + sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7"; + } { version = "12.0.0"; lang = "en";