From 8647ddb0d34b3d5aa6163859cb7e7b31f3754408 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Apr 2021 06:29:54 +0200 Subject: [PATCH] =?UTF-8?q?gnucash:=204.4=20=E2=86=92=204.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed a patch to fix build with GLib 2.68 and it did not apply to 4.4 so I also bumped the version 🤷‍♀️ Changes look fine: https://github.com/Gnucash/gnucash/releases/tag/4.5 --- pkgs/applications/office/gnucash/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 959aa30c037..d2251da7007 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages @@ -25,13 +25,21 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no="; + sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w="; }; + patches = [ + # Fix build with GLib 2.68. + (fetchpatch { + url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch"; + sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ="; + }) + ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; buildInputs = [