From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KOYRF5+ms2Q2BwAASxT56A (envelope-from ) for ; Sun, 16 Jul 2023 10:13:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YG7eFp+ms2QtbAEAauVa8A (envelope-from ) for ; Sun, 16 Jul 2023 10:13:19 +0200 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 C5A4532A1F for ; Sun, 16 Jul 2023 10:13:18 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=uuhK8LKe; dmarc=pass (policy=none) header.from=gnu.org; 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=1689495199; a=rsa-sha256; cv=none; b=MvNqyWbzpc0AuJVRXcJ1LzxLCb3bGyvvvVLMMFSjsk82bIpf/C4aZf95C65K9ZyyA75BKx lvnGrs6nTgW++SItVMANW7KeVtHBTbFmKZbr91LLXxCM5JuZ0Y/Xbre4KshqecbL8zM/Dc bopgZSe5tYhm9KGGyxBkMBzQL1qMlEM73EmiUdUYoN4HZn92upuX1rSUgIC8YN7ZGjho74 wsMd5++SPRky+p2+/RHgPWW6yaTaJ/CgtmfJOtVtG33D0ezhKU0/Lq/4sdirYP92qLxzDa JJ33YijxV5Ah8ECG7jgv342OVF9kE0mBW+yefXU1zzD9Rl/NKXQu3nz24DBsWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=uuhK8LKe; dmarc=pass (policy=none) header.from=gnu.org; 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=1689495199; 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-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=34x7mEaCuKq+y6yxtC6Ex+AgCpYUBNqmdoU3DhqZYaQ=; b=r42Cmy+WgNr5xOcjGX58wGlXIuFjPrTpPGwbQ7asPAi4qxazhjMztuijCXGtd1l9cDNMEt TRdfSYZrOHRlYW5XBAG/r0S8n1s5sJiZEGA8XergCE0PBuGsLXfViwH2OfHqs0bCsa/FIE wyQ4vAzrW5TZVbc6QWfnBbxYRzat7ioWGwzVULa+HMZOOcwHpmpZ/zRyfDOdAgK0s3Ci8X DEaaDGfYvROPl/jX1QFhHIQvUNha38JIWVTNTfrvCL1POW4K5dKaT0z5Eqsq1J3bK/eiNS nrC+O4/nLmN/iVNnwxvC9aEPcoDVQA/HGu7MAotambhtg1HLdiOEqL1pVHPCmA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKwsK-0007SA-55; Sun, 16 Jul 2023 04:13: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 1qKwsI-0007Ry-VY for guix-patches@gnu.org; Sun, 16 Jul 2023 04:13: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 1qKwsI-0006w6-Lo for guix-patches@gnu.org; Sun, 16 Jul 2023 04:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKwsI-0008E7-Gh for guix-patches@gnu.org; Sun, 16 Jul 2023 04:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64662] [PATCH] gnu: python-pyperclip: Improve Wayland support. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Jul 2023 08:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64662 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64662@debbugs.gnu.org Cc: Hilton Chain X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168949517531605 (code B ref -1); Sun, 16 Jul 2023 08:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jul 2023 08:12:55 +0000 Received: from localhost ([127.0.0.1]:46712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKwsA-0008Dh-Np for submit@debbugs.gnu.org; Sun, 16 Jul 2023 04:12:54 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKws5-0008DR-1C for submit@debbugs.gnu.org; Sun, 16 Jul 2023 04:12:52 -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 1qKwrz-0007RD-RM for guix-patches@gnu.org; Sun, 16 Jul 2023 04:12:43 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKwrx-0006sa-Q2 for guix-patches@gnu.org; Sun, 16 Jul 2023 04:12:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1689494909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=34x7mEaCuKq+y6yxtC6Ex+AgCpYUBNqmdoU3DhqZYaQ=; b=uuhK8LKeaoFl2RhC+aq6Yo1rw96ckA8k9N+Mjf5lJZM/pupz7keh6gidU0WE4+bCkKhyEo t+sSjiWLuwvSE/0foGAxzz+tbnQpU458E5menyf2Xew+aWmCqLRRFDMyHSHlZ+gaTNaxHv D1EU4jKQnab1wNv1baI3Yihq5wDX56X7h33xZwqRfNmwjQ6jHpWXvtkeoavvYAZac8Sfdr 9L1eKOJ4u/+J3YjnlNdUOP3bmsgkwBHMHHku33OEMhCZyU9Dv0PK2jlPjwzSeGmqEEVF/2 TBaWo2Ij929/84gt/MIx2+SgM8IWUcTmFWOtf3LhceMgfYp4IquB1XTXzS1gxQ== Date: Sun, 16 Jul 2023 16:11:57 +0800 Message-ID: <7d732b0b55c85524431db4cbb59e6d496fc69edc.1689495066.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.13 X-Migadu-Scanner: mx2.migadu.com X-Spam-Score: -6.13 X-Migadu-Queue-Id: C5A4532A1F X-TUID: R0i0dcEI0eBB * gnu/packages/xdisorg.scm (python-pyperclip)[snippet]: Adjust the source to test $WAYLAND_DISPLAY as well. --- gnu/packages/xdisorg.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1f7539764c..abe577edd6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2361,6 +2361,15 @@ (define-public python-pyperclip (origin (method url-fetch) (uri (pypi-uri "pyperclip" version)) + (modules '((guix build utils))) + (snippet + ;; XXX: Pyperclip's Linux detection currently only relies on $DISPLAY, + ;; which may not be set in a Wayland session. + ;; + ;; + '(substitute* "src/pyperclip/__init__.py" + (("^HAS_DISPLAY = os\\.getenv\\(\"DISPLAY\", False\\)" line) + (string-append line " or os.getenv(\"WAYLAND_DISPLAY\", False)")))) (sha256 (base32 "0mxzm43z2anr55gyz7awagvam4d5c2rlxhp9hjyg0d29n2l58lhh")))) base-commit: 093e9204183790558921c968034c547b41ebef3a -- 2.41.0