From 99d7805a6f0fe8920af412e750e249256a5d68ce Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 30 Jun 2018 02:43:37 +0200 Subject: [PATCH] kmymoney: Fix build with Qt 5.11 It's a really small fix that even could have been done via sed, but I'm using the upstream patch instead so that once a new upstream release comes along we don't forget to drop the patch. The patch is from the upstream commit at: https://cgit.kde.org/kmymoney.git/commit/?id=e5198a902996b27bf9abde0ad24af82d55ab5dc1 Signed-off-by: aszlig --- pkgs/applications/office/kmymoney/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 212aaa5fa2c4..7899bf607e54 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools +, fetchpatch , akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive , kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement @@ -20,6 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx"; }; + # Fix build with Qt 5.11. + patches = lib.singleton (fetchpatch { + url = "https://cgit.kde.org/kmymoney.git/patch/?id=" + + "e5198a902996b27bf9abde0ad24af82d55ab5dc1"; + sha256 = "1h2f1xznf7343s26fh94x8n2ci0pijk5j86f24lvghawsw848316"; + }); + # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";