From 74422033aa269c101b3c4d2f27acd335ffe97c32 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 28 Feb 2023 12:52:35 +0200 Subject: [PATCH] mmex: 1.6.1 -> 1.6.3 --- pkgs/applications/office/mmex/default.nix | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 4846279569f4..e1f39e8964c5 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -10,26 +10,29 @@ , wrapGAppsHook , curl , sqlite -, wxGTK +, wxGTK32 , gtk3 -, libobjc +, darwin }: stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-0zUZBkdFLvc32gkGqu0pYlVsHuwjhaVZzu9acSmNfu8="; + hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; }; postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" + '' + lib.optionalString (stdenv.isLinux && !stdenv.isx86_64) '' + substituteInPlace 3rd/CMakeLists.txt \ + --replace "-msse4.2 -maes" "" ''; nativeBuildInputs = [ @@ -46,14 +49,16 @@ stdenv.mkDerivation rec { buildInputs = [ curl sqlite - wxGTK + wxGTK32 gtk3 ] ++ lib.optionals stdenv.isDarwin [ - libobjc + darwin.libobjc ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-deprecated-copy" "-Wno-old-style-cast" + "-Wno-unused-parameter" ]); postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cf138d13488..6c5548efeff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31450,8 +31450,7 @@ with pkgs; MMA = callPackage ../applications/audio/MMA { }; mmex = callPackage ../applications/office/mmex { - inherit (darwin) libobjc; - wxGTK = wxGTK32.override { + wxGTK32 = wxGTK32.override { withWebKit = true; }; };