From e39c6abaacb6d5e4da0da693d748ed59d3e4e975 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 19 Oct 2024 11:49:24 +0200 Subject: [PATCH] mmex: 1.6.3 -> 1.8.0 --- pkgs/applications/office/mmex/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index b88f70225873..53cc19e5f1d3 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -1,7 +1,9 @@ { lib , stdenv , fetchFromGitHub +, appstream , cmake +, fetchpatch , gettext , git , makeWrapper @@ -17,16 +19,24 @@ stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.6.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; + hash = "sha256-jV1jW0aFx95JpwzywEVajstnMKVcEtBdvyL7y6OLl+k="; }; + patches = [ + (fetchpatch { # https://github.com/moneymanagerex/moneymanagerex/pull/6716 + name = "workaround-appstream-1.0.3.patch"; + url = "https://github.com/moneymanagerex/moneymanagerex/commit/bb98eab92d95b7315d27f4e59ae59b50587106d8.patch"; + hash = "sha256-98OyFO2nnGBRTIirxZ3jX1NPvsw5kVT8nsCSSmyfabo="; + }) + ]; + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" @@ -36,12 +46,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + appstream # for appstreamcli cmake gettext git makeWrapper pkg-config wrapGAppsHook3 + wxGTK32 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release ]; @@ -55,6 +67,8 @@ stdenv.mkDerivation rec { darwin.libobjc ]; + strictDeps = true; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-Wno-deprecated-copy" "-Wno-old-style-cast"