rosenthal/packages/xorg.scm

@@ -29,7 +29,6 @@
     (build-system cargo-build-system)
     (arguments
      (list #:install-source? #f
-           #:tests? #f                  ;Requires running display server.
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'fix-paths
@@ -37,7 +36,10 @@
                    (substitute* "src/lib.rs"
                      (("\"Xwayland\"")
                       (format #f "\"~a\""
-                              (search-input-file inputs "bin/Xwayland")))))))))
+                              (search-input-file inputs "bin/Xwayland"))))))
+               (add-before 'check 'prepare-for-tests
+                 (lambda _
+                   (setenv "XDG_RUNTIME_DIR" "/tmp"))))))
     (native-inputs (list pkg-config))
     (inputs
      (cons* clang

rosenthal/services/keyboard.scm

@@ -1,28 +0,0 @@
-;;; SPDX-FileCopyrightText: 2021 Andrew Tropin <andrew@trop.in>
-;;;
-;;; SPDX-License-Identifier: GPL-3.0-or-later
-
-(define-module (rosenthal services keyboard)
-  #:use-module (gnu system keyboard)
-  #:use-module (gnu home services)
-  #:export (home-keyboard-service-type))
-
-(define (set-xkb-variables layout)
-  (if layout
-      `(("XKB_DEFAULT_LAYOUT" . ,(keyboard-layout-name layout))
-	("XKB_DEFAULT_VARIANT" . ,(keyboard-layout-variant layout))
-	("XKB_DEFAULT_OPTIONS" . ,(string-join
-				   (keyboard-layout-options layout) ","))
-	("XKB_DEFAULT_MODEL" . ,(keyboard-layout-model layout)))
-      '()))
-
-(define home-keyboard-service-type
-  (service-type (name 'home-keyboard)
-                (extensions
-                 (list (service-extension
-			home-environment-variables-service-type
-			set-xkb-variables)))
-                (default-value #f)
-                (description "Set layouts by configuring XKB_*
-environment variables.  Service accepts an instance of
-@code{keyboard-layout} from @code{(gnu system keyboard)}.")))