From patchwork Thu May 30 18:18:17 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: 64996 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 8D51E27BBE9; Thu, 30 May 2024 19:21:23 +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 5F91027BBE9 for ; Thu, 30 May 2024 19:21:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCkOZ-0005bX-6T; Thu, 30 May 2024 14:20:59 -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 1sCkOX-0005b6-G0 for guix-patches@gnu.org; Thu, 30 May 2024 14:20:57 -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 1sCkOW-0007mn-Ek; Thu, 30 May 2024 14:20:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCkOc-0001Ni-2c; Thu, 30 May 2024 14:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68289] [PATCH v3 1/2] services: xorg: Add startx-command-service-type. References: <4fdf0d9993bb3375797ca807d894f66920bd81d2.1704553618.git.~@wolfsden.cz> In-Reply-To: <4fdf0d9993bb3375797ca807d894f66920bd81d2.1704553618.git.~@wolfsden.cz> Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, matt@excalamus.com, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 30 May 2024 18:21:02 +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: arunisaac@systemreboot.net, Tomas Volf <~@wolfsden.cz>, Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?utf-8?q?Court=C3=A8s?= , Matthew Trzcinski , Maxim Cournoyer Received: via spool by 68289-submit@debbugs.gnu.org id=B68289.17170932525275 (code B ref 68289); Thu, 30 May 2024 18:21:02 +0000 Received: (at 68289) by debbugs.gnu.org; 30 May 2024 18:20:52 +0000 Received: from localhost ([127.0.0.1]:50512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkOR-0001Mz-U4 for submit@debbugs.gnu.org; Thu, 30 May 2024 14:20:52 -0400 Received: from wolfsden.cz ([37.205.8.62]:59466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sCkOO-0001Mh-Vu for 68289@debbugs.gnu.org; Thu, 30 May 2024 14:20:50 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 87A6424BEF3; Thu, 30 May 2024 18:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1717093236; bh=gALTJYzecL1xy3FQl+NBhVdpYLhLzLSxo38KWUqJW40=; h=From:To:Cc:Subject:Date; b=CwZdquaV4pFC8Jwshws5zz4kTCVKU0shJGEjWfJL3+fAo6Mwdkw3Zv0Eu86ZmDXpp SZScnkChn3R/z+GxKSlPvUqwJg5G86YevZ5cRgrLcBGvep8VgyORr8APeskKfsGaf8 hAYGrWamVAtf6csbRAPJ6evT51WfXyEu5hKp8uet539HTkUO+mT25t2vliM9gKNMLz cyRCrYscXx9i/oWRzjQ0qvBq5bL+8rvvi+fW8Oh2yuflw/YqqFQ889IL5M6ruL3aBF qtriQfL5Od/1YrWqqkcD4K01jTfi8IdEhkiSc/SSgkrQeA78YPVJF6tUxdvd032q7n OmBi8hPQ5S1pA3JMWKe0CVM42mNglzYFgWqGt1utTYrzI/FNkChqs+iDM1Et4rJmex 3PcuJqQKbzSU2rLKupC4SctocMQkI5/aY7a0exK3yHlXLhxnYpzybDeZwEkMvR6Rpq OFGuEBBLSvii7GAKygGWU00QG9Zk1+SIGHX6MOdUyMX3MIaeS6pr8vIVJHX6qX9B4F Y4GAXUdXN0MnpWLu8AEIeV3Cb7K9uE5x2GZaZnLatuWvj8POLtRoQ4/Vnxme+MUENc 0ZeoYyau1zl4oO6Nlzs0PpH0GK3W6Adms5LWW43wkTe/tP5k8A+EXrUpycGipisKFA SOtJbH8pnV5LletP2Amqh/SM= Received: from localhost (unknown [81.17.16.72]) by wolfsden.cz (Postfix) with ESMTPSA id 773B824E302; Thu, 30 May 2024 18:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1717093235; bh=gALTJYzecL1xy3FQl+NBhVdpYLhLzLSxo38KWUqJW40=; h=From:To:Cc:Subject:Date; b=DrVXkyoKA3eDmpQjJEoLJVOc+N7jqFNQPo5DWQ0/KV8bVrmisgDbxZbEnIHRQRwHZ 5++T7UxX89S2n51BQClbkI2xshMOqIzSZUCUA+la8A1RkwsYW1Re0xXr/FsQ+rVynz nGbc8/7/rK914ULxJiawPt6zU5oZX8A5ymwctQPEqN54b1DS6/6kWUZEYcCP0+BbQJ qUR/kAWgj1PJ4Chqt4SBADO/+BsXnf3Z/2aKLo6nN3Syp7B8vn8NHO/Coi/M0mv4EY H9h/djc2q4BiYE8165uBTE/ZsTlKeD4ObxMNoQkIK0WZ6iZ+P+egTnF9gny0umDc/r 4HFzX0kBDzAziVVLKRgHC9cjmEZVPH2NZwPgVk2W/0NAaWfhSCWkP7z27YlDTAg7Wo NjlcOlYgZBvknJ1ODH+igFG9WmRmT5/+reYN4PUPXaq9cWvx9163KrelF+p/6awSsm oITDKZQ/+bZKsXeqxQghSFy6unJz3mF0qVBeHLXI2wAI/yAgtgxQmfRHO/jCzLhO+i ip9/dbkKBq1KE2vhW32D0nTnajMnhNszvUkB9SSDYdDiOonOlOC5ax/McyFdmnlHU5 cwdNs1+25FNkeJ72zM9wxMu6ZvMaJFebbAh5Q/Jsh4r4BbaBT0wTTb4LPhDc5abddd kcBpqeKnt6ApElRdRu1HCzNQ= From: Tomas Volf <~@wolfsden.cz> Date: Thu, 30 May 2024 20:18:17 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 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 --- doc/guix.texi | 10 ++++++++++ gnu/services/xorg.scm | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index b07b8dce6f..2cf1e58b5f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23803,6 +23803,16 @@ X Window @end deftp +@defvar startx-command-service-type +Add @command{startx} to the system profile putting it onto the +@env{PATH}. + +The value for this service is a @code{} object which +is passed to the @code{xorg-start-command-xinit} procedure producing the +@command{startx} used. Default value is @code{(xorg-configuration)}. +@end defvar + + @node Printing Services @subsection Printing Services diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 0b9803c425..d29daa59a8 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -92,6 +92,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