From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 04 07:24:06 2020 Received: (at 43446) by debbugs.gnu.org; 4 Oct 2020 11:24:06 +0000 Received: from localhost ([127.0.0.1]:45035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kP27a-0006vB-0b for submit@debbugs.gnu.org; Sun, 04 Oct 2020 07:24:06 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:44038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kP27X-0006ud-II for 43446@debbugs.gnu.org; Sun, 04 Oct 2020 07:24:04 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4C41Zj2ChWzQlCD for <43446@debbugs.gnu.org>; Sun, 4 Oct 2020 13:23:57 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1601810635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=PG1YtKuRefFPTUnl4P38eyQ7QknlL/46XlovtmW1WGs=; b=wtoKCY8O5BQQTRNQMo3RyNG2FDHW7MxB8b79KW+dVb1vYhZSV4CSSt0PBMlbRpfRKebqx2 7R6UCsRlWMOBpAKBpfhyMeUWllHL4KYTgRJsKq7MG/YlPGXM29IZPsqst7FKTLVx31z+G/ LJ9WOtyu8LNeSjqPoR+DCgkCYK+FDZSaNqhhOid1OR0S6JMgB0fY25rbB0oHvearHRqSLk uaTns1bpBd7v9A7rHh7bLN94zZc3OWpd0WgFCgGfG/nbbaYXyqvJ1XRqW0zzwV9N+iWYRE 4CTu6UWZCj3GCpAzpmrgkd7F+x8+NnkZe62gFuK1PO0JdFX1K5EskZmYE6uQtQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id 6ttDTEzjAJhK for <43446@debbugs.gnu.org>; Sun, 4 Oct 2020 13:23:53 +0200 (CEST) To: 43446@debbugs.gnu.org From: Brendan Tildesley Subject: [PATCH] guix: qt-build-system: Fix search-path wrapping. Message-ID: <9e55f119-b476-cefe-c5b2-33c96d60015c@brendan.scot> Date: Sun, 4 Oct 2020 22:23:44 +1100 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------D4A80F8E0DCF7899C1EA8FA1" Content-Language: en-US X-MBO-SPAM-Probability: X-Rspamd-Score: -6.24 / 15.00 / 15.00 X-Rspamd-Queue-Id: 59B6917DC X-Rspamd-UID: 878474 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 43446 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This is a multi-part message in MIME format. --------------D4A80F8E0DCF7899C1EA8FA1 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit --------------D4A80F8E0DCF7899C1EA8FA1 Content-Type: text/x-patch; charset=UTF-8; name="0001-guix-qt-build-system-Fix-search-path-wrapping.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-guix-qt-build-system-Fix-search-path-wrapping.patch" From 9c1d5b76c70ebf9942f6bb891677d260fe16cb62 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 4 Oct 2020 21:58:08 +1100 Subject: [PATCH] guix: qt-build-system: Fix search-path wrapping. * guix/build/qt-build-system.scm: (variables-for-wrapping): Modify qt-build-system's wrap-all-programs phase to prefix all wrapped search-path variables instead of overwriting them with =. This allows Qt applications to find plugins available in the environment. --- guix/build/qt-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index 005157b0a4..93f512b5d6 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -60,7 +60,7 @@ (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) (map (lambda (var-spec) - `(,(first var-spec) = ,(collect-sub-dirs base-directories (last var-spec)))) + `(,(first var-spec) prefix ,(collect-sub-dirs base-directories (last var-spec)))) (list ;; these shall match the search-path-specification for Qt and KDE ;; libraries -- 2.28.0 --------------D4A80F8E0DCF7899C1EA8FA1--