aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/display-managers.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-08-29 14:33:10 +0300
committerEfraim Flashner <efraim@flashner.co.il>2022-08-29 14:34:57 +0300
commit36078f15cef26ffeda486df5659763d09c99cbff (patch)
treebcb736982eb77399cd0dc7dfda83c17b6a6ed356 /gnu/packages/display-managers.scm
parent44403ca0eb0a793162a28b83d3281095c5f39a37 (diff)
downloadguix-36078f15cef26ffeda486df5659763d09c99cbff.tar
guix-36078f15cef26ffeda486df5659763d09c99cbff.tar.gz
gnu: sddm: Fix building with newer qt-5.
* gnu/packages/display-managers.scm (sddm)[source]: Add snippet to adjust to newer qt-5 code.
Diffstat (limited to 'gnu/packages/display-managers.scm')
-rw-r--r--gnu/packages/display-managers.scm13
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 6c1c5b6c25..cbcceba8f4 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
@@ -75,7 +75,16 @@
"sddm-" version ".tar.xz"))
(sha256
(base32
- "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
+ "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))
+ (snippet
+ #~(begin
+ ;; https://github.com/sddm/sddm/issues/1536
+ ;; https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308
+ ;; Commit comes shortly after the 0.19.0 release.
+ (use-modules ((guix build utils)))
+ (substitute* "src/daemon/XorgDisplayServer.cpp"
+ (("m_cookie\\[i\\] = digits\\[dis\\(gen\\)\\]")
+ "m_cookie[i] = QLatin1Char(digits[dis(gen)])"))))))
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules pkg-config qttools-5))