diff options
| author | Nathan van Doorn <nathan@myrtlesoftware.com> | 2019-09-20 10:17:53 +0100 |
|---|---|---|
| committer | Nathan van Doorn <nathan@myrtlesoftware.com> | 2019-09-20 10:17:53 +0100 |
| commit | 550d67cc0b379ddfb148052e51537b2b2e4d0b36 (patch) | |
| tree | 527be5efce978f523d05d9cc605e596f80716d77 | |
| parent | 27994da3185d3112d490b56798beee2a76ba8551 (diff) | |
| download | nixpkgs-550d67cc0b379ddfb148052e51537b2b2e4d0b36.tar nixpkgs-550d67cc0b379ddfb148052e51537b2b2e4d0b36.tar.gz nixpkgs-550d67cc0b379ddfb148052e51537b2b2e4d0b36.tar.bz2 nixpkgs-550d67cc0b379ddfb148052e51537b2b2e4d0b36.tar.lz nixpkgs-550d67cc0b379ddfb148052e51537b2b2e4d0b36.tar.xz nixpkgs-550d67cc0b379ddfb148052e51537b2b2e4d0b36.tar.zst nixpkgs-550d67cc0b379ddfb148052e51537b2b2e4d0b36.zip | |
kexi: patch error due to Qt 5.13
| -rw-r--r-- | pkgs/applications/office/kexi/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index adad5c8680f..83515de4990 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 = '' |