gnu: sddm: Fix FTBFS after Qt paths change.
authorMarius Bakke <mbakke@fastmail.com>
Sun, 22 Oct 2017 01:11:46 +0000 (03:11 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Sun, 22 Oct 2017 11:22:59 +0000 (13:22 +0200)
* gnu/packages/display-managers.scm (sddm)[arguments]: Add 'fix-qml-include'
phase.

gnu/packages/display-managers.scm

index 8e5bca6..7c7a70e 100644 (file)
@@ -4,6 +4,7 @@
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; 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")))