diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
| commit | 119a749db9c9847e0766860c17109b0f0b6bf349 (patch) | |
| tree | 4cdbfcad285124c1abf7b3c1c94666cef55767ce /gnu/packages/display-managers.scm | |
| parent | 530d9e1555e8d0125dde6893f5f70c7a1ebc2564 (diff) | |
| parent | 25669275a1a570cc266128274cb27a22f6a3a318 (diff) | |
| download | guix-119a749db9c9847e0766860c17109b0f0b6bf349.tar guix-119a749db9c9847e0766860c17109b0f0b6bf349.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/display-managers.scm')
| -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"))) |