diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-21 12:03:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-21 12:03:48 -0400 |
| commit | 9a9760d88e100e52154d9595681f9dd4303bb013 (patch) | |
| tree | c65a080761a17a855df1534ea6f25db18207bcc5 /pkgs/applications/office | |
| parent | da6e307f455e3ac66a9cc97db93c56de0ac8fda7 (diff) | |
| parent | 550d67cc0b379ddfb148052e51537b2b2e4d0b36 (diff) | |
| download | nixpkgs-9a9760d88e100e52154d9595681f9dd4303bb013.tar nixpkgs-9a9760d88e100e52154d9595681f9dd4303bb013.tar.gz nixpkgs-9a9760d88e100e52154d9595681f9dd4303bb013.tar.bz2 nixpkgs-9a9760d88e100e52154d9595681f9dd4303bb013.tar.lz nixpkgs-9a9760d88e100e52154d9595681f9dd4303bb013.tar.xz nixpkgs-9a9760d88e100e52154d9595681f9dd4303bb013.tar.zst nixpkgs-9a9760d88e100e52154d9595681f9dd4303bb013.zip | |
Merge pull request #69143 from Taneb/fix-kexi
kexi: patch error due to Qt 5.13
Diffstat (limited to 'pkgs/applications/office')
| -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 a4d8318d49a..8db7068f7cf 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 = '' |