From patchwork Sat May 11 13:26:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 64339 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B5D5F27BBE2; Sat, 11 May 2024 14:28:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4BB7627BBE2 for ; Sat, 11 May 2024 14:28:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5mlh-00081R-8m; Sat, 11 May 2024 09:28:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s5mlg-000819-C4 for guix-patches@gnu.org; Sat, 11 May 2024 09:28:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5mlg-0001yV-30 for guix-patches@gnu.org; Sat, 11 May 2024 09:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5mlf-000777-1p for guix-patches@gnu.org; Sat, 11 May 2024 09:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68289] [PATCH v2 2/3] services: xorg: Add startx-command-service-type. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 13:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68289 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68289@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68289-submit@debbugs.gnu.org id=B68289.171543408027327 (code B ref 68289); Sat, 11 May 2024 13:28:03 +0000 Received: (at 68289) by debbugs.gnu.org; 11 May 2024 13:28:00 +0000 Received: from localhost ([127.0.0.1]:48366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5mlb-00076b-ML for submit@debbugs.gnu.org; Sat, 11 May 2024 09:28:00 -0400 Received: from wolfsden.cz ([37.205.8.62]:50974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s5mlX-00076E-Ov for 68289@debbugs.gnu.org; Sat, 11 May 2024 09:27:57 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 67C4328885E; Sat, 11 May 2024 13:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715434074; bh=BpTPhVNFqgc8pHuYHOGv9f0jqtNiSBD4EzwDej5DyPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wzUxGu50k74AtYpm6nGCe41RMgkXZwZLLRyzq4sq3MEvM6ELSjnM9nYXd9qgqKZW1 J2K25QAySwnei8H+axAq9H7k10xnm3rsS6ow53oFCarlCQMcaUdq6At7+RrxZEICke yus5Ms6llwfRQKswrTzs0sEnlgzgTV4ymvIXkYZEplqAfq8uyj/PS2ZVq5/DGiBBfy UI3VmzODjGmvTDX17ktPTLCigjwawWNNvHua2oiHcrw/tw+e5GipaWuauE57vQt7cY gO6T7G5KyY6G2/OODOywxO6HB0qPJecQCcQSG7Gv3FzYIL1BQuat4KaldMVgP4AM9S uBnfq4xlRohHeC2GFeK0pa2zNhu4Jiy9jubKLY93UU9qWxmsWzNM6WeL3lTHcsb1E7 NSYoGLW+NdV7mUWlqAksAzhyJ4CTh5AK31EnyRGEM1xkrT5EWJSLAE82yK7cocOufI p9/KEVR00wKY4U4mZQHuRn4ONlk+U0qibQEYVy5akT6pQpHkvyrcfJAr4rVo7Jox5G jdXmRmGUWxpqxWiFdYCKOWhFpq5wtAYZa/n6bklEBNguM34R3g5y+tDxRIEKp6t4ek iAXN5SvkqBzFdDRbOAam13DITDEhBLm3iXGExGYWuzSU1gyZNCPnrFN2nQsaZwC7qH BBKsEXSqkg6t9/vUrGRFpzwQ= Received: from localhost (unknown [193.32.127.155]) by wolfsden.cz (Postfix) with ESMTPSA id 181212892C4; Sat, 11 May 2024 13:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715434074; bh=BpTPhVNFqgc8pHuYHOGv9f0jqtNiSBD4EzwDej5DyPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wzUxGu50k74AtYpm6nGCe41RMgkXZwZLLRyzq4sq3MEvM6ELSjnM9nYXd9qgqKZW1 J2K25QAySwnei8H+axAq9H7k10xnm3rsS6ow53oFCarlCQMcaUdq6At7+RrxZEICke yus5Ms6llwfRQKswrTzs0sEnlgzgTV4ymvIXkYZEplqAfq8uyj/PS2ZVq5/DGiBBfy UI3VmzODjGmvTDX17ktPTLCigjwawWNNvHua2oiHcrw/tw+e5GipaWuauE57vQt7cY gO6T7G5KyY6G2/OODOywxO6HB0qPJecQCcQSG7Gv3FzYIL1BQuat4KaldMVgP4AM9S uBnfq4xlRohHeC2GFeK0pa2zNhu4Jiy9jubKLY93UU9qWxmsWzNM6WeL3lTHcsb1E7 NSYoGLW+NdV7mUWlqAksAzhyJ4CTh5AK31EnyRGEM1xkrT5EWJSLAE82yK7cocOufI p9/KEVR00wKY4U4mZQHuRn4ONlk+U0qibQEYVy5akT6pQpHkvyrcfJAr4rVo7Jox5G jdXmRmGUWxpqxWiFdYCKOWhFpq5wtAYZa/n6bklEBNguM34R3g5y+tDxRIEKp6t4ek iAXN5SvkqBzFdDRbOAam13DITDEhBLm3iXGExGYWuzSU1gyZNCPnrFN2nQsaZwC7qH BBKsEXSqkg6t9/vUrGRFpzwQ= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 11 May 2024 15:26:24 +0200 Message-ID: <147282c44ee8fb331aefd38a699b082c78e5b637.1715433985.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <5197b347747fd3fb3d51a2c05b5cb676d387de8d.1715433985.git.~@wolfsden.cz> References: <5197b347747fd3fb3d51a2c05b5cb676d387de8d.1715433985.git.~@wolfsden.cz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/xorg.scm (startx-command-profile-service), (startx-command-service-type): New variables. (define-module): Export startx-command-service-type. Change-Id: Ia2a7c3b2d5ebf6bcfff40cb2640b17d3baf6eba0 --- v2: New patch in v2. gnu/services/xorg.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) -- 2.41.0 diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 11b9c36995..51fa6f619c 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -91,6 +91,7 @@ (define-module (gnu services xorg) xorg-start-command-xinit xinitrc xorg-server-service-type + startx-command-service-type %default-slim-theme %default-slim-theme-name @@ -496,6 +497,39 @@ (define* (xorg-start-command-xinit #:optional (config (xorg-configuration))) (program-file "startx" exp)) +(define (startx-command-profile-service config) + ;; XXX: profile-service-type only accepts objects. + (list + (package + (name "startx-profile-package") + (version "0") + (source (xorg-start-command-xinit config)) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let ((bin (string-append #$output "/bin"))) + (mkdir-p bin) + (symlink #$source (string-append bin "/startx")))))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f)))) + +(define startx-command-service-type + (service-type + (name 'startx-command) + (extensions + (list (service-extension profile-service-type + startx-command-profile-service))) + (default-value (xorg-configuration)) + (description "Add @command{startx} to the system profile."))) + + + (define* (xinitrc #:key fallback-session) "Return a system-wide xinitrc script that starts the specified X session, which should be passed to this script as the first argument. If not, the