From a5f90be736ebfd0b0e2a9ed5ed688468f1c16d25 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Tue, 14 Nov 2017 11:25:48 +0000 Subject: [PATCH] wxmaxima: 15.04.0 -> 17.10.1 also fix crash at start-up due missing icons fixes #18479 (cherry picked from commit 21423521e61e9be39ee28665c4a2b6f043fbcd73) --- .../science/math/wxmaxima/default.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 2000a1e511702d..6c866a8d21640a 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,35 +1,35 @@ -{ stdenv, fetchurl, maxima, wxGTK, makeWrapper }: - -let - name = "wxmaxima"; - version = "15.04.0"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; - sha256 = "1fm47ah4aw5qdjqhkz67w5fwhy8yfffa5z896crp0d3hk2bh4180"; +{ stdenv, fetchFromGitHub +, wrapGAppsHook, autoreconfHook, gettext +, maxima, wxGTK, gnome3 }: + +stdenv.mkDerivation rec { + name = "wxmaxima-${version}"; + version = "17.10.1"; + + src = fetchFromGitHub { + owner = "andrejv"; + repo = "wxmaxima"; + rev = "Version-${version}"; + sha256 = "088h8dlc9chkppwl4ck9i0fgf2d1dcpi5kq8qbpr5w75vhwsb6qm"; }; - buildInputs = [wxGTK maxima makeWrapper]; + buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; + + nativeBuildInputs = [ wrapGAppsHook autoreconfHook gettext ]; - postInstall = '' - # Make sure that wxmaxima can find its runtime dependencies. - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix PATH ":" "${maxima}/bin" - done + preConfigure = '' + gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) ''; doCheck = true; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Cross platform GUI for the computer algebra system Maxima"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; homepage = http://wxmaxima.sourceforge.net; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; + platforms = platforms.linux; + maintainers = [ maintainers.peti ]; }; }