mbakke pushed a commit to branch master
in repository guix.
commit 58f0a19c5843f9d187b4b60b1ec42a3357ce9d13
Author: Marius Bakke <[email protected]>
Date: Sun Oct 22 03:11:46 2017 +0200
gnu: sddm: Fix FTBFS after Qt paths change.
* gnu/packages/display-managers.scm (sddm)[arguments]: Add 'fix-qml-include'
phase.
---
gnu/packages/display-managers.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/display-managers.scm
b/gnu/packages/display-managers.scm
index 8e5bca6..7c7a70e 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2014 Andreas Enge <[email protected]>
;;; Copyright © 2017 Ricardo Wurmus <[email protected]>
;;; Copyright © 2017 Sou Bunnbu <[email protected]>
+;;; Copyright © 2017 Marius Bakke <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -188,6 +189,14 @@ Qt-style API for Wayland clients.")
(substitute* "CMakeLists.txt"
(("/usr/bin/loginctl") (which "loginctl")))
#t))
+ (add-before 'configure 'fix-qml-include
+ (lambda _
+ ;; Make sure QtQml is found when building the helper.
+ ;; See <https://github.com/sddm/sddm/pull/918>.
+ (substitute* "src/helper/CMakeLists.txt"
+ (("target_link_libraries\\(sddm-helper")
+ "target_link_libraries(sddm-helper Qt5::Qml"))
+ #t))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
