diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-28 08:45:43 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-28 08:45:43 +0100 |
commit | 92cc19490e7fe141257dbb840ad518c7156f0efb (patch) | |
tree | 6616200b1e87d24973b7c04b469b69a529a9f9f2 /pkgs/applications/kde/kaddressbook.nix | |
parent | d2f5d37c7ab262c64a188fa968dfabb46601d4b6 (diff) | |
parent | d4a33d75f2030abc5556ff2769cdc578bad316af (diff) |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/kde/kaddressbook.nix')
-rw-r--r-- | pkgs/applications/kde/kaddressbook.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index b4b0450e78bf0..452c5142157d1 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, @@ -8,11 +8,18 @@ }: mkDerivation { - name = "kaddressbook"; + pname = "kaddressbook"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = [ + # Patch for Qt 5.15.2 until version 20.12.0 + (fetchpatch { + url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch"; + sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash |