summary refs log tree commit diff
path: root/gnu/packages/kde.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2020-07-22 13:47:39 -0400
committerLeo Famulari <leo@famulari.name>2020-07-23 16:43:33 -0400
commit5f63905096e456097fca206f56ce9257f72faf64 (patch)
treed413a6b1328dbc2c98af775a1825d4b836661242 /gnu/packages/kde.scm
parente165a2492d73d37c8b95d6970d453b9d88911ee6 (diff)
downloadguix-5f63905096e456097fca206f56ce9257f72faf64.tar.gz
gnu: Fix Krita.
Fixes <https://bugs.gnu.org/42476>.
Reported by linka on #guix.

* gnu/packages/patches/qtbase-fix-krita-deadlock.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/kde.scm (qtbase-for-krita): New variable.
(krita)[inputs]: Replace qtbase with qtbase-for-krita.
Diffstat (limited to 'gnu/packages/kde.scm')
-rw-r--r--gnu/packages/kde.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 9a80e362b6..9fa8ed7c15 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -360,6 +360,14 @@ a module for implementing ODF Gantt charts, which are bar charts that
 illustrate project schedules.")
     (license license:gpl2+)))
 
+(define qtbase-for-krita
+  (package
+    (inherit qtbase)
+    (source (origin
+              (inherit (package-source qtbase))
+              (patches (append (origin-patches (package-source qtbase))
+                               (search-patches "qtbase-fix-krita-deadlock.patch")))))))
+
 (define-public krita
   (package
     (name "krita")
@@ -434,7 +442,7 @@ illustrate project schedules.")
        ("openexr" ,openexr)
        ("perl" ,perl)
        ("poppler-qt5" ,poppler-qt5)
-       ("qtbase" ,qtbase)
+       ("qtbase" ,qtbase-for-krita)
        ("qtdeclarative" ,qtdeclarative)
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg)