[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: services: Add 'xorg-server-service-type'.
From: |
guix-commits |
Subject: |
branch master updated: services: Add 'xorg-server-service-type'. |
Date: |
Thu, 11 Feb 2021 04:03:11 -0500 |
This is an automated email from the git hooks/post-receive script.
iyzsong pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new e429325 services: Add 'xorg-server-service-type'.
e429325 is described below
commit e429325d37e5752656a03882f60ee56d4f541fd1
Author: 宋文武 <iyzsong@member.fsf.org>
AuthorDate: Fri Nov 13 21:57:04 2020 +0800
services: Add 'xorg-server-service-type'.
* gnu/services/xorg.scm (xorg-server-service-type): New service type.
(xorg-server-profile-service): New procedure.
---
gnu/services/xorg.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 4590709..60611dc 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -45,6 +45,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages bash)
#:use-module (gnu system shadow)
+ #:use-module (guix build-system trivial)
#:use-module (guix gexp)
#:use-module (guix store)
#:use-module (guix packages)
@@ -70,6 +71,7 @@
xorg-wrapper
xorg-start-command
xinitrc
+ xorg-server-service-type
%default-slim-theme
%default-slim-theme-name
@@ -483,6 +485,41 @@ a `service-extension', as used by
`set-xorg-configuration'."
(xorg-configuration xorg-configuration))
config)))))))
+(define (xorg-server-profile-service config)
+ ;; XXX: profile-service-type only accepts <package> objects.
+ (list
+ (package
+ (name "xorg-wrapper")
+ (version (package-version xorg-server))
+ (source (xorg-wrapper config))
+ (build-system trivial-build-system)
+ (arguments
+ '(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((source (assoc-ref %build-inputs "source"))
+ (out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (symlink source (string-append bin "/X"))
+ (symlink source (string-append bin "/Xorg"))
+ #t))))
+ (home-page (package-home-page xorg-server))
+ (synopsis (package-synopsis xorg-server))
+ (description (package-description xorg-server))
+ (license (package-license xorg-server)))))
+
+(define xorg-server-service-type
+ (service-type
+ (name 'xorg-server)
+ (extensions
+ (list (service-extension profile-service-type
+ xorg-server-profile-service)))
+ (default-value (xorg-configuration))
+ (description "Add @command{X} to the system profile, to be used with
+@command{sx} or @command{xinit}.")))
+
;;;
;;; SLiM log-in manager.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: services: Add 'xorg-server-service-type'.,
guix-commits <=