From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mN5gI/NNC2RrRQAASxT56A (envelope-from ) for ; Fri, 10 Mar 2023 16:34:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qFaYIvNNC2Q6lwAAG6o9tA (envelope-from ) for ; Fri, 10 Mar 2023 16:34:11 +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 1C76635545 for ; Fri, 10 Mar 2023 16:34:09 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=burningswell-com.20210112.gappssmtp.com header.s=20210112 header.b=l4rgkt93; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678462451; h=from:from:sender:sender: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=JFlOxz+VyIWmgjDrrkLBY0ig2/pOtKpGEP/90BYt9c8=; b=fUiFu9jFvTZR1VxfmXPA69BH8NV8v7okNEUCzYhgb7Yd1sGKdoJv7tpQ7isz0grArh8g6v tk4l9lP1lFqWPpuK2748bCD+FYvUvHSBBqyq2yA1xaeqgm8DuCc7VuDB4unCLCzo4rv+B+ nnC+K0zv0EKb4bZio6lj5+BjmXqAEjOt0eewFZqiTokMZSkjx0vzXM1iis66+MXYOxBSNf Y/VgxAWvdh6m/5eEsYSgPLZbqvtl30n+GsxdETpWUoYnW93i/Ir2RrAKJWTKNVxAj+NxwR GU+U6wiTygoaTG5S/CF+1Nf8iEOe3BG8Uzbg3d2nasYCyod8DLUlcO/zYwjQMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=burningswell-com.20210112.gappssmtp.com header.s=20210112 header.b=l4rgkt93; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678462451; a=rsa-sha256; cv=none; b=srKd/uDrPT79BWF/q/GX75obl8mOemNHnM6OnHFEHZG4hZiA5mNKEHfV/iZkpiLwYt5pud GplzaxgYG3/Sw7/JIIoLn8bKLT8AHE7EaVkIlTHhsfhB9xMyIlyvkW3QhpM8TrmP6Rxb4B EzBCDkjOIP//td2+etcFu6dPj/fCSiEVYdvoNG6yoyfdEkmCdeBq2juZrLe0BWU4bkzVQt 2xG69AMniXsW1W/VTdWWlGjxNd1DrSy1B7BMe1/PsyPI/WUK0HbxTAT3z43zkisHOn9BdZ FrzRXgPw0a/XQF28YuALy9szDtjejMAVyZ/QZa4gKOYISzcXGxjBk62BkMXndw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paekv-0000Zs-1g; Fri, 10 Mar 2023 10:34:05 -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 1paeks-0000Za-Vh for guix-patches@gnu.org; Fri, 10 Mar 2023 10:34:02 -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 1paeks-0005mz-Mp for guix-patches@gnu.org; Fri, 10 Mar 2023 10:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paekr-0005eN-Ui for guix-patches@gnu.org; Fri, 10 Mar 2023 10:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61458] [PATCH] services: xorg-wrapper: Support xorg server input Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Mar 2023 15:34:01 +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: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Cc: 61458@debbugs.gnu.org Received: via spool by 61458-submit@debbugs.gnu.org id=B61458.167846242221691 (code B ref 61458); Fri, 10 Mar 2023 15:34:01 +0000 Received: (at 61458) by debbugs.gnu.org; 10 Mar 2023 15:33:42 +0000 Received: from localhost ([127.0.0.1]:55552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paekX-0005dm-VL for submit@debbugs.gnu.org; Fri, 10 Mar 2023 10:33:42 -0500 Received: from mail-ed1-f50.google.com ([209.85.208.50]:35784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paekV-0005da-U3 for 61458@debbugs.gnu.org; Fri, 10 Mar 2023 10:33:40 -0500 Received: by mail-ed1-f50.google.com with SMTP id u9so22084521edd.2 for <61458@debbugs.gnu.org>; Fri, 10 Mar 2023 07:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; t=1678462414; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=JFlOxz+VyIWmgjDrrkLBY0ig2/pOtKpGEP/90BYt9c8=; b=l4rgkt93zOWRgQD7pLaYTt1gOz3Fg2tkwj6nfw5fuEflIDd/M2rkEsbFMNCt+VkTNW euWACd3p4RokswW67LeEt5odfzdZ/sPB7BnDU9qVeg+Xr9lRWZTIEXlOPlrryLS1oL8p hxECiJTUx+qYH4boOmHtKQyr/0wos/bmtZPMrQYmppxQ+tDzU14sTce1OT2vHiCLWxDZ wBxZJ+iFzTB3DmWfv8udYQitnVBtQSEpk1+WIrhKOqdqwGb7knF61xCALy+l1HKCexAh 8cdU6oLPCWbDMXfEQHPiT69D6pqjUzd/p3g9gzWOaPH0YffMGRNPZtfwGxexBUjjKAvH F6Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678462414; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=JFlOxz+VyIWmgjDrrkLBY0ig2/pOtKpGEP/90BYt9c8=; b=GSLt8zP48rhsNqHzya4cj+AirpKno3j0Qzggz+gqM2Uq0yb192Q6bqzDsK1Z/i0c5g M4hZ0c9DlL1gxPy9c6l3LQmXP7kUZF98Ja2MWkQG3CQ3BEBjAU9eO7GFEXj4B74DWDIT QRXh4Lg95IFNZ5u6ENsU9R+3qtDAE2k4ZGCqU88pR56lHKMtjwvSZ949cUFW5+4pV4sA 2cs7TsIbZFENMUd9/NogkABUmhSsEyDAXVOipGg+alrjP8u2hD5JdwYNonXTWMWk18iM aMo1U0JIlJZ3Ki2g07mjvBxWaq3D7Wes3fWLF9/MxV4hWtee/8uHSlCT9iktyM8NIG10 5yNg== X-Gm-Message-State: AO0yUKXQdxiMcC06KQC3vcAQogJ/osULHwjLww9s0Wlab4j9uTx3YLxM nYBgvNctKc2t/OQceqrzZOmlRezVlBxWjNP0hkk= X-Google-Smtp-Source: AK7set9Ec/kTabEsXjoNBNJBX9CynuKZMwMpbJsj3pXTQaUKGFPBY1NCqA9/4tps4KlFE7ExLIp/Wg== X-Received: by 2002:a05:6402:654:b0:49e:1f0e:e209 with SMTP id u20-20020a056402065400b0049e1f0ee209mr2926209edx.10.1678462413814; Fri, 10 Mar 2023 07:33:33 -0800 (PST) Received: from bombaclaat ([2a01:598:b1af:e722:2fbf:91d3:41c3:f544]) by smtp.gmail.com with ESMTPSA id s13-20020a170906454d00b008b1b644c9fbsm14836ejq.103.2023.03.10.07.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Mar 2023 07:33:33 -0800 (PST) References: <86k00mvgmi.fsf@burningswell.com> <871qm1nyau.fsf@envs.net> User-agent: mu4e 1.8.13; emacs 29.0.60 From: Roman Scherer Date: Fri, 10 Mar 2023 16:32:28 +0100 In-reply-to: <871qm1nyau.fsf@envs.net> Message-ID: <86o7p039kj.fsf@burningswell.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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: X-Migadu-Queue-Id: 1C76635545 X-Spam-Score: -5.39 X-Migadu-Spam-Score: -5.39 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , 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 X-TUID: /gkgjIDneHHF --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi =E5=AE=8B=E6=96=87=E6=AD=A6, thanks for taking a look. I messed up my system, but will update the patch once I got everyting working again. Roman =E5=AE=8B=E6=96=87=E6=AD=A6 writes: > 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 =3D> >> (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 transf= ormations. >> --- >> 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 pat= h) >> + (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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFTBAEBCAA9FiEE0iajOdjfRIFd3gygPdpSUn0qwZkFAmQLTcwfHHJvbWFuLnNj aGVyZXJAYnVybmluZ3N3ZWxsLmNvbQAKCRA92lJSfSrBmcpaB/94+vinsbcxYfj1 6hAhCdyIOr5ngPdHlJiPpRYSYqbfEK0Mq8WJTGljE0TXKsrNXsamCzkgHxk2Q2sU TUoEGYxeM8cryx12el+ISDNM0iuAcHMdRSxzO9+wF62dr5XJ0L2cJqbQxIkudt7+ ORljc5QP0x4CQ8dIXjd1syxG1n8UQJPVuxtErApwLUL5r1HsW8cSgPa4jxl+Xd7H 8I34/1NA2YQlAbFA1o85o2/Ed8i0Gpd5qGss7jlKxTmALLcXkfghX1sUDEVYXAAG 8YxCsua2kePxZ3pwM4dvp/lNYtmEADx9LxhWI6Vz5EhCCNMCHahUz3Q1v9HI/osu ulqQABGN =J74u -----END PGP SIGNATURE----- --=-=-=--