amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: lightdm: Use global sysconfdir.

Browse source 
* gnu/packages/display-managers.scm (lightm)
[#:configure-flags]: Set sysconfdir to /etc.
[#:phases]: Overwrite sysconfdir in install phase for installing sample config
files.

Change-Id: If9c6ce810c726551bd3bf568d50cad8680829262
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Dariqq 2024-11-02 10:18:32 +00:00 • committed by Maxim Cournoyer
parent 97dccd6449
commit b9d7e15f9f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -382,9 +382,10 @@ experience for your users, your family and yourself")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:parallel-tests? #f ; fails when run in parallel #:parallel-tests? #f ; fails when run in parallel
#:configure-flags #:configure-flags
#~(list "--localstatedir=/var" #~(list "--localstatedir=/var"
"--sysconfdir=/etc"
"--enable-gtk-doc" "--enable-gtk-doc"
;; Otherwise the test suite fails on such a warning. ;; Otherwise the test suite fails on such a warning.
"CFLAGS=-Wno-error=missing-prototypes") "CFLAGS=-Wno-error=missing-prototypes")
@ -412,7 +413,17 @@ experience for your users, your family and yourself")
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
;; Avoid printing locale warnings, which trip up the text ;; Avoid printing locale warnings, which trip up the text
;; matching tests. ;; matching tests.
(unsetenv "LC_ALL")))))) (unsetenv "LC_ALL")))
(replace 'install
(lambda* (#:key make-flags #:allow-other-keys #:rest args)
;; Override the sysconfdir flag only for the installation phase,
;; as it attempts to write the sample config files to /etc and
;; fail otherwise.
(define make-flags*
(append make-flags (list (string-append "sysconfdir="
#$output "/etc"))))
(apply (assoc-ref %standard-phases 'install)
(append args (list #:make-flags make-flags*))))))))
(inputs (inputs
(list audit (list audit
bash-minimal ;for cross-compilation bash-minimal ;for cross-compilation
@ -432,7 +443,7 @@ experience for your users, your family and yourself")
itstool itstool
intltool intltool
libtool libtool
vala ;for Vala bindings vala ;for Vala bindings
;; For tests ;; For tests
;; All tests fail with dbus >= 1.15.2, see ;; All tests fail with dbus >= 1.15.2, see
;; https://github.com/canonical/lightdm/issues/346 ;; https://github.com/canonical/lightdm/issues/346