TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: sddm: Fix build.

Browse source 
* gnu/packages/display-managers.scm (sddm)[arguments]: Use gexp for
configure-flags.
This commit is contained in:
Efraim Flashner 2021-09-02 17:15:39 +03:00
parent d3d2fae2ce
commit f8836774e2
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com> ;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -37,6 +38,7 @@ (define-module (gnu packages display-managers)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
@ -95,23 +97,23 @@ (define-public sddm
("wayland" ,wayland))) ("wayland" ,wayland)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list ,#~(list
;; This option currently does nothing, but will presumably be enabled ;; This option currently does nothing, but will presumably be enabled
;; if/when <https://github.com/sddm/sddm/pull/616> is merged. ;; if/when <https://github.com/sddm/sddm/pull/616> is merged.
"-DENABLE_WAYLAND=ON" "-DENABLE_WAYLAND=ON"
"-DENABLE_PAM=ON" "-DENABLE_PAM=ON"
;; Both flags are required for elogind support. ;; Both flags are required for elogind support.
"-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON" "-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON"
"-DCONFIG_FILE=/etc/sddm.conf" "-DCONFIG_FILE=/etc/sddm.conf"
;; Set path to /etc/login.defs. ;; Set path to /etc/login.defs.
;; An alternative would be to use -DUID_MIN and -DUID_MAX. ;; An alternative would be to use -DUID_MIN and -DUID_MAX.
(string-append "-DLOGIN_DEFS_PATH=" (string-append "-DLOGIN_DEFS_PATH="
(assoc-ref %build-inputs "shadow") #$shadow
"/etc/login.defs") "/etc/login.defs")
(string-append "-DQT_IMPORTS_DIR=" (string-append "-DQT_IMPORTS_DIR="
(assoc-ref %outputs "out") "/lib/qt5/qml") #$output "/lib/qt5/qml")
(string-append "-DCMAKE_INSTALL_SYSCONFDIR=" (string-append "-DCMAKE_INSTALL_SYSCONFDIR="
(assoc-ref %outputs "out") "/etc")) #$output "/etc"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'embed-loginctl-reference (add-after 'unpack 'embed-loginctl-reference