diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 03:11:46 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 13:22:59 +0200 |
| commit | 58f0a19c5843f9d187b4b60b1ec42a3357ce9d13 (patch) | |
| tree | 7444857796f91fd9cd898c958f756e3bd7483a3d /gnu | |
| parent | 03639d0354b708ac8ec08ff216113ca197c46787 (diff) | |
| download | guix-58f0a19c5843f9d187b4b60b1ec42a3357ce9d13.tar guix-58f0a19c5843f9d187b4b60b1ec42a3357ce9d13.tar.gz | |
gnu: sddm: Fix FTBFS after Qt paths change.
* gnu/packages/display-managers.scm (sddm)[arguments]: Add 'fix-qml-include'
phase.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/display-managers.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 8e5bca64c0..7c7a70e950 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -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"))) |