summaryrefslogtreecommitdiff
path: root/gnu/packages/kde.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2020-07-23 16:53:52 -0400
committerLeo Famulari <leo@famulari.name>2020-07-23 16:55:02 -0400
commite61b3bcd79a85babde19101118e9d51cd769fbbb (patch)
treef0ec191e98f585da42221c3d8b71cc67c75eddce /gnu/packages/kde.scm
parent5f63905096e456097fca206f56ce9257f72faf64 (diff)
Revert "gnu: Fix Krita."
This reverts commit 5f63905096e456097fca206f56ce9257f72faf64. This commit caused `guix pull` to crash like this: ------ Backtrace: In ice-9/boot-9.scm: 222:29 19 (map1 _) 222:29 18 (map1 _) 222:29 17 (map1 _) 222:29 16 (map1 _) 222:17 15 (map1 (((gnu packages kde)) ((gnu packages libevent)) ((gnu packages libidn)) ((gnu packages #)) ((?)) ?)) 3297:17 14 (resolve-interface (gnu packages kde) #:select _ #:hide _ #:prefix _ #:renamer _ #:version _) In ice-9/threads.scm: 390:8 13 (_ _) In ice-9/boot-9.scm: 3223:13 12 (_) In ice-9/threads.scm: 390:8 11 (_ _) In ice-9/boot-9.scm: 3507:20 10 (_) 2806:4 9 (save-module-excursion _) 3527:26 8 (_) In unknown file: 7 (primitive-load-path "gnu/packages/kde" #<procedure 7f68d6fe5da0 at ice-9/boot-9.scm:3514:37 ()>) In ice-9/eval.scm: 626:19 6 (_ #<directory (gnu packages kde) 7f68d6175b40>) 293:34 5 (_ #<directory (gnu packages kde) 7f68d6175b40>) 173:47 4 (_ #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval.sc?>)) 159:9 3 (_ #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval.sc?>)) 191:35 2 (_ #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval.sc?>)) 223:20 1 (proc #(#<directory (gnu packages kde) 7f68d6175b40> #<promise #<procedure 7f68dc5a5d00 at ice-9/eval?>)) In unknown file: 0 (%resolve-variable (7 . qtbase) #<directory (gnu packages kde) 7f68d6175b40>) ERROR: In procedure %resolve-variable: error: qtbase: unbound variable ------
Diffstat (limited to 'gnu/packages/kde.scm')
-rw-r--r--gnu/packages/kde.scm10
1 files changed, 1 insertions, 9 deletions
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 9fa8ed7c15..9a80e362b6 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -360,14 +360,6 @@ 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")
@@ -442,7 +434,7 @@ illustrate project schedules.")
("openexr" ,openexr)
("perl" ,perl)
("poppler-qt5" ,poppler-qt5)
- ("qtbase" ,qtbase-for-krita)
+ ("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)