colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #210361 from wegank/wxmaxima-bump

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/science/math/wxmaxima/default.nix
View File

@ -7,17 +7,18 @@
, maxima , maxima
, wxGTK , wxGTK
, gnome , gnome
, glib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wxmaxima"; pname = "wxmaxima";
version = "22.05.0"; version = "22.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wxMaxima-developers"; owner = "wxMaxima-developers";
repo = "wxmaxima"; repo = "wxmaxima";
rev = "Version-${version}"; rev = "Version-${version}";
sha256 = "sha256-pcKnEjJmvMXCBpjtOSLyl4I0x3fjh0os9Sdp39I2Re0="; sha256 = "sha256-RT6y4M6LQD1fXJcjtdSXnDmoJvv160g2asdV4WtTcok=";
}; };
buildInputs = [ buildInputs = [
@ -25,6 +26,8 @@ stdenv.mkDerivation rec {
maxima maxima
# So it won't embed svg files into headers. # So it won't embed svg files into headers.
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
# So it won't crash under Sway.
glib
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -33,6 +36,10 @@ stdenv.mkDerivation rec {
gettext gettext
]; ];
cmakeFlags = [
"-DwxWidgets_LIBRARIES=${wxGTK}/lib"
];
preConfigure = '' preConfigure = ''
gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin)
''; '';

4
pkgs/top-level/all-packages.nix
View File

@ -36654,7 +36654,9 @@ with pkgs;
}; };
wxmaxima = callPackage ../applications/science/math/wxmaxima { wxmaxima = callPackage ../applications/science/math/wxmaxima {
wxGTK = wxGTK32; wxGTK = wxGTK32.override {
withWebKit = true;
};
}; };
pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; }; pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; };