diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-01-15 02:46:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 02:46:09 +0100 |
| commit | c58002056abf77aeb2ae484ae30bda546e3954d2 (patch) | |
| tree | 087e9e78765e543992014a615d967abd0f7d54a2 | |
| parent | c83517aba760fd968e4916c8d155eee47e4a5088 (diff) | |
| parent | 89d4b2b4df27a62600fe45ee824643c59a28ed34 (diff) | |
Merge pull request #210361 from wegank/wxmaxima-bump
Closes https://github.com/NixOS/nixpkgs/issues/210224
| -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 c4fc8ddf6ccf..b1c922c46594 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36654,7 +36654,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; }; |