Merge pull request #210361 from wegank/wxmaxima-bump

Closes https://github.com/NixOS/nixpkgs/issues/210224
This commit is contained in:
Sandro 2023-01-15 02:46:09 +01:00 committed by GitHub
commit c58002056a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions

View File

@ -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)
'';

View File

@ -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; };