about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Alan Dorman <mdorman@ironicdesign.com>2017-11-27 20:35:34 -0500
committerOrivej Desh <orivej@gmx.fr>2017-11-28 23:44:02 +0000
commitb802f1a4cbfc84fc4890b4e7439231d409a9b982 (patch)
tree0222037105af8d2e9588a84c6738c1b4bcbe1bab /pkgs
parent7d69f112937aa003120fda80d95b24f803d9285b (diff)
downloadnixlib-b802f1a4cbfc84fc4890b4e7439231d409a9b982.tar
nixlib-b802f1a4cbfc84fc4890b4e7439231d409a9b982.tar.gz
nixlib-b802f1a4cbfc84fc4890b4e7439231d409a9b982.tar.bz2
nixlib-b802f1a4cbfc84fc4890b4e7439231d409a9b982.tar.lz
nixlib-b802f1a4cbfc84fc4890b4e7439231d409a9b982.tar.xz
nixlib-b802f1a4cbfc84fc4890b4e7439231d409a9b982.tar.zst
nixlib-b802f1a4cbfc84fc4890b4e7439231d409a9b982.zip
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.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/office/gnucash/2.6.nix12
1 files 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
   '';