ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 22:26:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sddm: Fix FTBFS after Qt paths change.

Browse source 
* gnu/packages/display-managers.scm (sddm)[arguments]: Add 'fix-qml-include'
phase.
This commit is contained in:
Marius Bakke 2017-10-22 03:11:46 +02:00
parent 03639d0354
commit 58f0a19c58
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/display-managers.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -188,6 +189,14 @@ (define-public sddm
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("/usr/bin/loginctl") (which "loginctl"))) (("/usr/bin/loginctl") (which "loginctl")))
#t)) #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 (add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))