From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SGK8Kgq51GYRPwEAqHPOHw:P1 (envelope-from ) for ; Sun, 01 Sep 2024 18:57:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id SGK8Kgq51GYRPwEAqHPOHw (envelope-from ) for ; Sun, 01 Sep 2024 20:57:14 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=NeGMC+nt; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=lzmkwYjQ; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725217033; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=I9xwbYyehFvzBkH/1PJ773R2iuaD09SPxanpmTTXT4U=; b=k9mu/ILfKBVODjfV/yK3Ne8mkkpKjeS72hkbEPwKafLbVLkbRTS7kf3lFJ4KXWnw5dKQAO wXm8OecJ5VEV01QuWgj3JNr6DEmVItduuxkpVXtQhA0IeqVDtASbEF2nbKU5bhPBDxe1a4 7HQ+Pp0LieNCAAPHoZsZbCpEzLbh8e8SIaa0Tiw8juwr/YxQ85zJcGTgiFeJiZgVTydCOZ K/xjIqWDZjXQzWoXoGBJ+c/bLQSUuKOKM+CPzxVgiH9GAQPMYiClfmRmZ45ESp0DuIChB1 sJwZvDwYWQB1u0KgYuvn5qQ1Wk9vCnESONy2QLjhUKTJeN/7EvoMp/U3gjVSMA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=NeGMC+nt; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=lzmkwYjQ; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725217033; a=rsa-sha256; cv=none; b=VeLV1DSVF69kcren9waPfJAi0hTj8lhigZF8Q8l/+ZLtlE9a85siwZ1B0GyV22QL/WXJmb h512Qp1k4L1qZJs676axNaXcoJIbseLBGm02L8hT3BAObfatrUPMqGH+ALcN5y1jkXu/C4 CeNA+Ji5n54n3ldmUhqzORe3Q6OtLbfi/g+GDkzKCT8y5i0Eo0buno964VS3cDhrtCj7nL oXa2F/nGed2HPUAo8cp9uHqE9RC+v0Ch6Sy+YS+u8ve/1asF115shVZhvsZ/laE5IUzyd1 /P/AMFp2NsGGgPrVUfdiH354dvqyi1o3E1W7vX8ewdLOgNHe96H5oP3OWtiHOA== 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 64D0D692CB for ; Sun, 1 Sep 2024 20:57:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1skpl2-0002fN-Bf; Sun, 01 Sep 2024 14:57:04 -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 1skpl0-0002eq-NH for guix-patches@gnu.org; Sun, 01 Sep 2024 14:57:02 -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 1skpl0-0004qB-E4 for guix-patches@gnu.org; Sun, 01 Sep 2024 14:57:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=I9xwbYyehFvzBkH/1PJ773R2iuaD09SPxanpmTTXT4U=; b=NeGMC+ntClTiOYsgTBIO7i9BIPJ7dwYKrBIsaufcU6uFYoxkNsMaL2HrvhKlTJYp5rKRjviBtJYl8DnyNkVZf7BTRULdRDMH4vpMJvc5mMMHSbyWorulo2V5F8kDQY5d5Rwqa2urDE8JsQFw/HRwBhiyemBVqbF5ITZRVUL+egVsEKQQsg6u+8FEEtMk1cHHgbw7vtLoR2EfavMbSRRc9Q7iqq4lkx3gAQIf7z4eVGYFq4W2q6YYFRXDrh9h5j8QkA8bjVuxhppJzMtVmiYdnH4jQGHDMESKyWT1JbbK/1mkb/yhYz14tbwvDeDn/XukW2JDYT0vGu7v4m8gHfRf7Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1skply-0001uN-7O for guix-patches@gnu.org; Sun, 01 Sep 2024 14:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72937] [PATCH 2/2] gnu: autorandr: Use GEXPs. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Sep 2024 18:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72937 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72937@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 72937-submit@debbugs.gnu.org id=B72937.17252170607292 (code B ref 72937); Sun, 01 Sep 2024 18:58:02 +0000 Received: (at 72937) by debbugs.gnu.org; 1 Sep 2024 18:57:40 +0000 Received: from localhost ([127.0.0.1]:38686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skplc-0001tY-4H for submit@debbugs.gnu.org; Sun, 01 Sep 2024 14:57:40 -0400 Received: from mail-lf1-f53.google.com ([209.85.167.53]:41051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skplX-0001t2-I5 for 72937@debbugs.gnu.org; Sun, 01 Sep 2024 14:57:36 -0400 Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-52ef9714673so712409e87.0 for <72937@debbugs.gnu.org>; Sun, 01 Sep 2024 11:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725216929; x=1725821729; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I9xwbYyehFvzBkH/1PJ773R2iuaD09SPxanpmTTXT4U=; b=lzmkwYjQP4HZ9NencaYUWu8WAI9OIlieXwEz14H9C27gI0UUv/bz6h5NO69/+VWWqj 3eA3RgD14CzGMBfORxvMwtt4C/dtgt9F/+QanlZaqmOE6msC6hoLXK4aaIiv6wc7YdB/ L1vD4qwb/sjg+6QGMfuDNcJj6+lGrexndnQEmnMAbGlA5nT8e8qC3h2HuSCJXvGoELp4 mHKnBzDdXq4F2CG4M/WNu617hCZ7jGKokM5dwHE/r0adLAKMi30otP3SSK7jhgh7KHD3 SG//44S8Kq4w8UKyAARLunfIMqtCwCd5ahGoy7R6TTYdJ1B804zzZmsNZk9xMcnG+FVu /mJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725216929; x=1725821729; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I9xwbYyehFvzBkH/1PJ773R2iuaD09SPxanpmTTXT4U=; b=XzM5pgJZ+PKAXuXPBm4MnnjqW6EF8/t2sK195GQ0msyyW08qyvTEDxGsiW3WD5K5QS 5Q0iWND/NnqU6v7sEGjp3WVrZCYw1Wjp0Y7aVCmANrqUTkrPPEVfB0FaU6JqKjOxhupu zpLOPiJbL3RwZWSXkIj+/CFSbVFI6Z51BJzOhyoLFRkrI/OAjW01xX+G4d20etY8ghbe PM1l4wUkwozU/nkmBVFYaBMOLd1NdGweawW6ZL25IQhJonrwlmigVLPhTLOw7FYHgzUo l34A/pmKnj1IiGyT8M2Zdje1sP5UFWFQk26LOwMvS/mPNp7zhAEmjTqaSjI6JPtCns5i 3JZg== X-Gm-Message-State: AOJu0YxrXA1Snor9RQSHU4bNedcsn9r2jMxreIZEgomi0LcqsuCTsMwz 8y/1MhLBDsHxIaEgwfBfDOQ9A7ZizkO33nu4t/K2fgVoWuIsx8V4URbvyg== X-Google-Smtp-Source: AGHT+IFVhatnJ8ehtzlg1cL3Y1bVwfS6s2tWU70OEaIHt6jhruFEfINn9rRuI2UBnKV6SV6qwV33Qg== X-Received: by 2002:a2e:be27:0:b0:2f0:1a95:7102 with SMTP id 38308e7fff4ca-2f61e0aba23mr30658421fa.6.1725216928598; Sun, 01 Sep 2024 11:55:28 -0700 (PDT) Received: from elephant.. ([5.164.196.227]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f614f00484sm14749911fa.32.2024.09.01.11.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Sep 2024 11:55:28 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sun, 1 Sep 2024 21:55:23 +0300 Message-ID: <617d4764936280f3fe24c7928195078f563f255f.1725216784.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -5.02 X-Migadu-Queue-Id: 64D0D692CB X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -5.02 X-TUID: ld0gJtAxV0V/ * gnu/packages/xdisorg.scm (autorandr): Use GEXPs. Change-Id: I476e29ddff17c0180e8a0eeefe818954364eac71 --- gnu/packages/xdisorg.scm | 45 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index e470ad8c0a..f123b739e7 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -298,29 +298,28 @@ (define-public autorandr (inputs (list xrandr libxcb)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((xrandr (search-input-file inputs "/bin/xrandr"))) - (substitute* "contrib/etc/xdg/autostart/autorandr.desktop" - (("/usr") (assoc-ref outputs "out"))) - (substitute* "autorandr.py" - (("popen\\(\"xrandr") (string-append "popen(\"" xrandr)) - (("\\[\"xrandr") (string-append "[\"" xrandr))) - (substitute* "contrib/autorandr_launcher/autorandr_launcher.c" - (("/usr/bin/autorandr") - (string-append (assoc-ref outputs "out") "/bin/autorandr"))) - (setenv "CC" "gcc")) - #t)) - (add-after 'install 'install-contrib - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" - (string-append "DESTDIR=" (assoc-ref outputs "out")) - "PREFIX=" - "BASH_COMPLETIONS_DIR=etc/bash_completion.d" - "install" - "TARGETS=autorandr launcher manpage bash_completion")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'build 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((xrandr (search-input-file inputs "/bin/xrandr"))) + (substitute* "contrib/etc/xdg/autostart/autorandr.desktop" + (("/usr") (assoc-ref outputs "out"))) + (substitute* "autorandr.py" + (("popen\\(\"xrandr") (string-append "popen(\"" xrandr)) + (("\\[\"xrandr") (string-append "[\"" xrandr))) + (substitute* "contrib/autorandr_launcher/autorandr_launcher.c" + (("/usr/bin/autorandr") + (string-append (assoc-ref outputs "out") "/bin/autorandr"))) + (setenv "CC" "gcc")))) + (add-after 'install 'install-contrib + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" + (string-append "DESTDIR=" (assoc-ref outputs "out")) + "PREFIX=" + "BASH_COMPLETIONS_DIR=etc/bash_completion.d" + "install" + "TARGETS=autorandr launcher manpage bash_completion")))))) (synopsis "Auto-detect connected displays and load appropriate setup") (description "Autorandr wraps around xrandr to help with X11 multi-screen configuration management. It allows the user to create profiles -- 2.45.2