From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id ELf9Oq6TBmQLeQAASxT56A (envelope-from ) for ; Tue, 07 Mar 2023 02:30:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id yFNOO66TBmR0hAAAauVa8A (envelope-from ) for ; Tue, 07 Mar 2023 02:30:22 +0100 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 7D024671A for ; Tue, 7 Mar 2023 02:30:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZM9U-0006OT-QR; Mon, 06 Mar 2023 20:30:04 -0500 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 1pZM9T-0006OJ-BX for guix-patches@gnu.org; Mon, 06 Mar 2023 20:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZM9T-0007lh-3V for guix-patches@gnu.org; Mon, 06 Mar 2023 20:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZM9S-000737-R6 for guix-patches@gnu.org; Mon, 06 Mar 2023 20:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61458] [PATCH] services: xorg-wrapper: Support xorg server input 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: Tue, 07 Mar 2023 01:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61458 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Roman Scherer Cc: 61458@debbugs.gnu.org Received: via spool by 61458-submit@debbugs.gnu.org id=B61458.167815258927053 (code B ref 61458); Tue, 07 Mar 2023 01:30:02 +0000 Received: (at 61458) by debbugs.gnu.org; 7 Mar 2023 01:29:49 +0000 Received: from localhost ([127.0.0.1]:44051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZM9F-00072H-7j for submit@debbugs.gnu.org; Mon, 06 Mar 2023 20:29:49 -0500 Received: from mail.envs.net ([5.199.136.28]:56774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZM9C-000728-Rt for 61458@debbugs.gnu.org; Mon, 06 Mar 2023 20:29:48 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 69D9338A0876; Tue, 7 Mar 2023 01:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1678152585; bh=yBgqcsB7+qkbA6tO8AwzsXk7Xyv5YCZuVHsKTCmVxrs=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=Ehxal39vq6jniDXHo2p9JAXvHqE8AR8Tv1s1PeVvHud+uN7ak/kMXDO9QuXsTpCo4 ZbORUH+KYuPQSUepYaUZcS9cirKKEZlEh96Lmv/PHn5gZ7pRyQe8Dkm3Q4Gzan+F1n GKJJqWiCRKlptBdUxNUElbq2Nkq8sCAXp+9tWau9xGwkpfyMpzjmRPlzFA6NMoChJ8 teo14D6ineu4UxHm9wng9vBDAw4C3SSJmWMrB/HLM0rH5KQQ45Zt4nbNhS3pCyV6BG 3Fa79shb1W+afCXMYlmUuq/lfqMSs2Xptvyo24grx1XFXl31fKByjRc20QEoSsDGXP ZkrQvrQdvyb5XKgZ6mIWK83doHIRcNza0BDfhphytlb2DfBsm3o/xt4zGp4WMdK11r sJn2J+DEsscXwI0Q8Wv2RkWCe4IU9dINQ0lwCPdeivU103+D6dsmpNdqynAopYHy+x ZGCOkanhxTyRvsMTBQo10Q9yGbGLKA+bajoKIuB5r+LTLMh0qkuIvy51SOYt/ARKYp z+dmxzF/D9dGOUNW67HGpSns6vwxsxS9aAkYzXdtUhCiQayE09BhJdr6WT/5kW9Ost 4epZHsB4dLUgX0xUk3MCN1Ch8MbD98YgVT8yaPW0M/v2iTfag/pGmui7EQIhlpvKyg 9WrIaHGZGKnT77mmVqhK4RWA= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id o9qVdzsRSIpK; Tue, 7 Mar 2023 01:29:42 +0000 (UTC) Received: from localhost (unknown [182.150.116.135]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 7 Mar 2023 01:29:42 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ec5474e8; Tue, 7 Mar 2023 01:30:01 +0000 (UTC) References: <86k00mvgmi.fsf@burningswell.com> Date: Tue, 07 Mar 2023 09:30:01 +0800 In-Reply-To: <86k00mvgmi.fsf@burningswell.com> (Roman Scherer's message of "Sun, 12 Feb 2023 19:52:40 +0100") Message-ID: <871qm1nyau.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: , Reply-to: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-ACL-Warn: , =?utf-8?b?5a6L5paH5q2mIHZpYSBHdWl4LXBhdGNoZXM=?= From: =?utf-8?b?5a6L5paH5q2mIHZpYSBHdWl4LXBhdGNoZXM=?= via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678152622; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=yBgqcsB7+qkbA6tO8AwzsXk7Xyv5YCZuVHsKTCmVxrs=; b=k2X9s37ps2dnpJZOz9wzBeY5PwsV38ALsTBSgGR1WrvQTd0TgMQEc3RzWBkb2FsZ0FEMHa qKUnYngr+2fNIWlKhhfdi9dHm/nu00k8ZzUlWqsiWMuWvWB8yp5qKNi/eel8XejwoRcdOO pI7XowqjKR1mKWA+d6e8Y/qKgU7/QX6hbecgWpCOmyXwRkm6hm9o7NqJOmwAGQD7lsmnSw etlggJwB/cSduouRjd58dV8LTpaI76NrJj1nDBePRBVnLS49K5JsFERcf6t9/8xYgWFKAe Lqz82Au2pGWRy4PiMQQBJVCfrP/118pubGhtq7DTF9LYB1NM4etZqJwpGyRM2Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=Ehxal39v; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678152622; a=rsa-sha256; cv=none; b=qjrYlpXP6lwKioCVjt4jJ2lMGcUrkElvF9tC1hvU0xWp2mFHrnDFhglfrARo4dh0ZJCxdo +PG5drebicuv1UacZY60JhdXVqYoQhTWJR8DBwa+NecVPDUeBdKYN/kkjlqPp91k3h2zJj wWIh7Kwh+Hj9u10pbDz0yU/E9pWIqH3jqKQCsLwSpHLih3nfp4wm4KOYP7+tfyvg4r/067 3SDFbGt91wC3u6yrMm6DFHBQH6ZuHqcm+3slH44bUnwpxdE3Jm/tcrPDZwSRndZ1SzKCO6 THIx0Zb3MZ3J2h2350JUk37a8dS6NrIz4Z/pONxcPZMqLWILGSf1LkSvywkd9Q== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=Ehxal39v; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Spam-Score: -2.21 X-Spam-Score: -2.21 X-Migadu-Queue-Id: 7D024671A X-Migadu-Scanner: scn1.migadu.com X-TUID: BDSF/JO8gHbu Roman Scherer writes: > Hello Guix, > > I would like to replace the Mesa package in my Xorg configuration. I > tried to do this with the following snippet: > > ``` > (modify-services %desktop-services > (slim-service-type config => > (slim-configuration > (inherit config) > (xorg-configuration > (xorg-configuration > (server (replace-mesa xorg-server))))))) > ``` > > But this unfortunately does not work, because the xorg-wrapper uses > static paths for the mesa, xkbcomp and xkeyboard-config packages in the > derivation. > > The xserver starts now with the replaced mesa, but some paths still > point to the hard coded packages in Guix itself (and not the > replacement), which cause some things to not work. > > This patch changes this to lookup the paths from the inputs of the > server field of the xorg-configuration instead. That way the correct > paths are setup in the xor-wrapper script. If those inputs are not found > for some reason it falls back to the current behavior, using the > packages from Guix. > > Could you please review this? > > Thanks, Roman. Sorry for a long deley.. > > From d035c99ed4703da0e3e9b62299c390560c074a17 Mon Sep 17 00:00:00 2001 > From: r0man > Date: Sat, 11 Feb 2023 19:36:16 +0100 > Subject: [PATCH] services: xorg-wrapper: Support xorg server input > transformations. I think it's better add some explaination to commit message like: The xorg-wrapper uses [...] This patch [...] Should be good. > > * gnu/services/xorg.scm (xorg-wrapper): Support xorg server input transformations. > --- > gnu/services/xorg.scm | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm > index 5f073d05d3..92735e6004 100644 > --- a/gnu/services/xorg.scm > +++ b/gnu/services/xorg.scm > @@ -355,6 +355,21 @@ (define files > files) > #t)))) > > +(define (xorg-configuration-append-input config input default-input path) > + (let ((server (xorg-configuration-server config))) > + (file-append (or (lookup-package-direct-input server input) default-input) > + path))) I'm not sure about the procedure name, maybe add a docstring explain it's function? Otherwise, look good to me, thank you!