From b802f1a4cbfc84fc4890b4e7439231d409a9b982 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 27 Nov 2017 20:35:34 -0500
Subject: [PATCH 1/3] gnucash: fix breaking test

Patch taken from the upstream repository, should be fixed in next
released version.

This did require moving the invocation of `patchShebangs` from
`patchPhase` to `postpatch`, but this seems consistent with at least
some other packages.
---
 pkgs/applications/office/gnucash/2.6.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 3421abc557fc..66328ee4ccb9 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -2,7 +2,7 @@
 , intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
 , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
 , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
-, pango, gdk_pixbuf
+, pango, gdk_pixbuf, fetchpatch
 }:
 
 /*
@@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
     sha256 = "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp";
   };
 
+  patches = [
+    (fetchpatch {
+     sha256 = "11nlf9j7jm1i37mfcmmnkplxr3nlf257fxd01095vd65i2rn1m8h";
+     name = "fix-brittle-test.patch";
+     url = "https://github.com/Gnucash/gnucash/commit/42ac55e03a1a84739f4a5b7a247c31d91c0adc4a.patch";
+    })
+  ];
+
   buildInputs = [
     # general
     intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant
@@ -40,7 +48,7 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  patchPhase = ''
+  postPatch = ''
   patchShebangs ./src
   '';
 

From 6baf21f6bb93d334a827464d35f860a20fbf65df Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 8 Nov 2017 20:13:33 -0500
Subject: [PATCH 2/3] gnucash: 2.6.12 -> 2.6.18-1

This version still requires the prior test fix.
---
 pkgs/applications/office/gnucash/2.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 66328ee4ccb9..99839f8a352e 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -13,11 +13,11 @@ Two cave-ats right now:
 */
 
 stdenv.mkDerivation rec {
-  name = "gnucash-2.6.12";
+  name = "gnucash-2.6.18-1";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp";
+    sha256 = "1794qi7lkn1kbnhzk08wawacfcphbln3ngdl3q0qax5drv7hnwv8";
   };
 
   patches = [

From 070769940671311b4fdfac73ec831d07f82748ee Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 28 Nov 2017 23:47:06 +0000
Subject: [PATCH 3/3] gnucash: use nativeBuildInputs

---
 pkgs/applications/office/gnucash/2.6.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 99839f8a352e..14c954c0c831 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -1,8 +1,9 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile
-, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
-, webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
+{ fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper
+, libxml2, libxslt, perl, perlPackages, gconf, guile
+, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
+, webkit, glibcLocales, gsettings_desktop_schemas, dconf
 , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
-, pango, gdk_pixbuf, fetchpatch
+, pango, gdk_pixbuf
 }:
 
 /*
@@ -28,9 +29,11 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  nativeBuildInputs = [ intltool pkgconfig file makeWrapper ];
+
   buildInputs = [
     # general
-    intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant
+    libxml2 libxslt glibcLocales gettext swig enchant
     bzip2 isocodes
     # glib, gtk...
     glib gtk2 goffice webkit
@@ -44,12 +47,10 @@ stdenv.mkDerivation rec {
     guile slibGuile
     # database backends
     libdbi libdbiDrivers
-    # build
-    makeWrapper
   ];
 
   postPatch = ''
-  patchShebangs ./src
+    patchShebangs ./src
   '';
 
   configureFlags = [