diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-14 20:02:56 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-14 20:02:56 +0100 |
| commit | 89d4b2b4df27a62600fe45ee824643c59a28ed34 (patch) | |
| tree | 03d26f067b5a0f806055a3ece2229f5c8ec473e2 | |
| parent | 0792676d67081df80152b663f967258d341701cf (diff) | |
wxmaxima: 22.05.0 -> 22.12.0
| -rw-r--r-- | pkgs/applications/science/math/wxmaxima/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index aea24b84d1d4..205fe3ebed5d 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -7,17 +7,18 @@ , maxima , wxGTK , gnome +, glib }: stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "22.05.0"; + version = "22.12.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0="; + sha256 = "sha256-RT6y4M6LQD1fXJcjtdSXnDmoJvv160g2asdV4WtTcok="; }; buildInputs = [ @@ -25,6 +26,8 @@ stdenv.mkDerivation rec { maxima # So it won't embed svg files into headers. gnome.adwaita-icon-theme + # So it won't crash under Sway. + glib ]; nativeBuildInputs = [ @@ -33,6 +36,10 @@ stdenv.mkDerivation rec { gettext ]; + cmakeFlags = [ + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + ]; + preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 212f49362096..50f0d7a9cb07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36556,7 +36556,9 @@ with pkgs; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { - wxGTK = wxGTK32; + wxGTK = wxGTK32.override { + withWebKit = true; + }; }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; |