From 550d67cc0b379ddfb148052e51537b2b2e4d0b36 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Fri, 20 Sep 2019 10:17:53 +0100 Subject: kexi: patch error due to Qt 5.13 --- pkgs/applications/office/kexi/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index adad5c8680fc..83515de49903 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, boost, qttools, qtwebkit, breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, @@ -28,6 +28,17 @@ mkDerivation rec { propagatedUserEnvPkgs = [ kproperty ]; + patches = [ + # Changes in Qt 5.13 mean that QDate isn't exported from certain places, + # which the build was relying on. This patch explicitly imports QDate where + # needed. + # Should be unnecessary with kexi >= 3.3 + (fetchpatch { + url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53"; + sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj"; + }) + ]; + meta = with lib; { description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; longDescription = '' -- cgit 1.4.1