From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8MatIrCXr1/uDgAA0tVLHw (envelope-from ) for ; Sat, 14 Nov 2020 08:39:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id Ws+HHrCXr19gHAAAB5/wlQ (envelope-from ) for ; Sat, 14 Nov 2020 08:39:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 157F29401BE for ; Sat, 14 Nov 2020 08:39:11 +0000 (UTC) Received: from localhost ([::1]:39048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdr5S-0000TC-Sp for larch@yhetil.org; Sat, 14 Nov 2020 03:39:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdr5K-0000Rj-V1 for guix-patches@gnu.org; Sat, 14 Nov 2020 03:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38144) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kdr5K-0000hQ-GS for guix-patches@gnu.org; Sat, 14 Nov 2020 03:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kdr5K-0001ao-Dj for guix-patches@gnu.org; Sat, 14 Nov 2020 03:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44621] [PATCH] services: Add 'xorg-server-service-type'. Resent-From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Nov 2020 08:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44621 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44621@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 44621-submit@debbugs.gnu.org id=B44621.16053430906038 (code B ref 44621); Sat, 14 Nov 2020 08:39:02 +0000 Received: (at 44621) by debbugs.gnu.org; 14 Nov 2020 08:38:10 +0000 Received: from localhost ([127.0.0.1]:49687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdr4S-0001ZH-F8 for submit@debbugs.gnu.org; Sat, 14 Nov 2020 03:38:10 -0500 Received: from mail-oln040092253018.outbound.protection.outlook.com ([40.92.253.18]:6009 helo=APC01-SG2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdlRc-0001JI-Ga for 44621@debbugs.gnu.org; Fri, 13 Nov 2020 21:37:43 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=icKtoC4g7QZha7ASTlLAeXWrVOtFTEzqSo4Q4fmlqjmX2CtqAm84ClFbLu9/PVcTR92doyuy1x3cbsOTLXABk+dWLugzVuH/z63pRUlvTRdzmzuFeZrLCiezOA5WYzR22GmjG9OhPjglPo9lH3uws5a7uEQ5TxqsYafzYS7DTD8MEsEYDqeFXhwvHDH98Owk/3c7fxgiMe/N08nd+jHgqdkXwzp9ePg2J5QHG4RLYggFQbz031WeuX85JgD9Io7kBDcgJztLsRV4/gZ8MwN65JMnHWkJ/+nMfsLjUHGnI6tMbm+pf2IX2m2igJCAdJJwC7JDaoYwB5zPTKIOYsDmQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3QUDTnMopVBdchw3DAF3hwjbtOleJI6ggwiLt0Wa8FQ=; b=B5jXCX27M/UteflBItNpBVyvgX1KufNW3c2gOQgKSlF7GYx3AbxBvfbg3UJNgekFbzzCUAi8Tuy+St48eAT+diz7PHRb6N/FUlHyw1f/+Ir+nu7KPz646xW+HmdDtoNzCGY4+tSqrT5qIzJeJ0JkM8vr9lscD9OGGGEAJ+OTiwlKiL/2lwB5KzCOlAXc12VkcaciEwDTP7BiBg/EzUc1lHchQ5sjCQHiE2Y3Sl25x+GUUa7oL6Eb+u7rkQArY/EXUMD06jPMzjIzyScy5e3FDpJsBS764tHyRSjK3hf5VQwZkXUm5+nmGxOEoilceCpT4tNfv/yUTGoxqmhueuUemw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3QUDTnMopVBdchw3DAF3hwjbtOleJI6ggwiLt0Wa8FQ=; b=TwMLVw55Z1AdBMMpMqKzn3RHCZGIfEr/HmIw650KG66X3X23LKGd79BhcUPDC4L0WjB0gRKK3thz0OLO8ccHVwB8JeaMg79elZcHts1zsfpSFcwyghA7GwgFUkpV0Piaery3M0scdBqyAD0sFUlcAGdfTUoS7EUkK3pOqooAdO03pGaxRCHkZgZ6TeyfQawAvpJp+XUR9fxh9GBZpfPXaIjxvSeOjr8VzhxOKvS+2lk5wqfMtFXAKFLrsL2RYGOEx38Gs3RPYD8q5G64DAmUPenJqs5RZoNrNshptbhtOD0OR/H8BwY/GIXQA6CGYGWNy2VoRPHp7yvpY1TVfv2Nmw== Received: from HK2APC01FT059.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::4d) by HK2APC01HT094.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::435) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.22; Sat, 14 Nov 2020 02:37:29 +0000 Received: from OS0P286MB0178.JPNP286.PROD.OUTLOOK.COM (10.152.248.51) by HK2APC01FT059.mail.protection.outlook.com (10.152.249.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.22 via Frontend Transport; Sat, 14 Nov 2020 02:37:29 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:420B789780348F553C2A456663C2DF56D31B9136312577F64A380FB73AA2C429; UpperCasedChecksum:A31011585A186E524E722F2C87BBBEAA316F90B2E28F0DF91571D0B9515AB582; SizeAsReceived:7624; Count:46 Received: from OS0P286MB0178.JPNP286.PROD.OUTLOOK.COM ([fe80::3813:6edd:69a0:95e]) by OS0P286MB0178.JPNP286.PROD.OUTLOOK.COM ([fe80::3813:6edd:69a0:95e%7]) with mapi id 15.20.3541.025; Sat, 14 Nov 2020 02:37:29 +0000 From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= References: Date: Sat, 14 Nov 2020 10:37:35 +0800 In-Reply-To: (iyzsong@outlook.com's message of "Fri, 13 Nov 2020 22:00:33 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [rmSJwcVpnnYDyWCAjyEyTacklyS98bau9OehBaw1Ap1Cun1JEQVLCgQcGb2QiAft] X-ClientProxiedBy: SJ0PR13CA0094.namprd13.prod.outlook.com (2603:10b6:a03:2c5::9) To OS0P286MB0178.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:95::7) X-Microsoft-Original-Message-ID: <87r1owmzo0.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (2409:8a62:373:ff0:2f1:f5ff:fe18:6bb) by SJ0PR13CA0094.namprd13.prod.outlook.com (2603:10b6:a03:2c5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.21 via Frontend Transport; Sat, 14 Nov 2020 02:37:28 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 83cc53a3-bf55-4ad5-f4c7-08d888463b26 X-MS-TrafficTypeDiagnostic: HK2APC01HT094: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0DKgR2FHrORNIAhqEXMXua5feEpOQ+eZhAQ48/KbnODwTpcw+Vq2K++JDstr+frTJ7ucSgmCIsEHExGfEMKWX8lIasukvFh3NrmwOKVWWr0IpmatEsQQjvlF99F9O1Az+1djE83miUFYaclab5EDB2dSciKH/1cIEYuobVtSQnNhYTD9loULPLx8ORxi/IcBGwOwNI5HDIqEVUfPifut5A== X-MS-Exchange-AntiSpam-MessageData: J4q10HWwk2RSgcJ2xeWbAd/4rmRlaXGKtk7xR9rIZrmWSmjAEzFJSPSyLgwFqTlOfg0pjDK+Q/vU+e8GSKHpBA7N9muv+mPDTZ6f+/u6/GHZx0ysNyAyrfkrffxrjffxzGcpCAu7pzYyIEq2+VB8xSlaa8VetX0f7tcz5XAdnIQ3gpXt7IE/Z7/LUS71pzTfQNA+dOD9d8h1v70nXpCCxQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83cc53a3-bf55-4ad5-f4c7-08d888463b26 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2020 02:37:29.7588 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HK2APC01FT059.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2APC01HT094 X-Spam-Score: -0.0 (/) X-Mailman-Approved-At: Sat, 14 Nov 2020 03:38:07 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=outlook.com header.s=selector1 header.b=TwMLVw55; arc=reject (signature check failed: fail, {[1] = sig:microsoft.com:reject}); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 2.19 X-TUID: NLcnO7jVwgk4 --=-=-= Content-Type: text/plain Update patch to symlink 'Xorg' for 'sx': --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-services-Add-xorg-server-service-type.patch >From 3f15fe4f9e2fbbc48998453708102bb2c9dc8b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Fri, 13 Nov 2020 21:57:04 +0800 Subject: [PATCH] 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 4590709187..60611dc77d 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 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. -- 2.29.1 --=-=-= Content-Type: text/plain With this service, we can run 'sx' from the console as a normal user. If you want to use 'xinit', put this into ~/.xserverrc: --8<---------------cut here---------------start------------->8--- tty=$(tty) tty=${tty#/dev/tty} X vt${tty} --8<---------------cut here---------------end--------------->8--- --=-=-=--