diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/tests/lightdm.scm | |
parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/tests/lightdm.scm')
-rw-r--r-- | gnu/tests/lightdm.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm index 431b388e7e..57d029a75a 100644 --- a/gnu/tests/lightdm.scm +++ b/gnu/tests/lightdm.scm @@ -34,6 +34,7 @@ #:use-module (gnu services xorg) #:use-module (gnu system) #:use-module (gnu system file-systems) + #:use-module (gnu system keyboard) #:use-module (gnu system shadow) #:use-module (gnu system vm) #:use-module (gnu tests) @@ -56,7 +57,11 @@ (inherit %simple-os) (packages (cons* ocrad ratpoison xterm %base-packages)) (services - (cons* (service lightdm-service-type + (cons* (set-xorg-configuration (xorg-configuration + (keyboard-layout (keyboard-layout "us"))) + lightdm-service-type) + + (service lightdm-service-type (lightdm-configuration (allow-empty-passwords? #t) (debug? #t) |