unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Brendan Tildesley <mail@brendan.scot>
To: 43446@debbugs.gnu.org
Subject: bug#43446: [PATCH] guix: qt-build-system: Fix search-path wrapping.
Date: Sun, 4 Oct 2020 22:23:44 +1100	[thread overview]
Message-ID: <9e55f119-b476-cefe-c5b2-33c96d60015c@brendan.scot> (raw)
In-Reply-To: <650d1848-7dc8-2063-265c-1a965a1dd5ee@brendan.scot>

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-guix-qt-build-system-Fix-search-path-wrapping.patch --]
[-- Type: text/x-patch, Size: 1158 bytes --]

From 9c1d5b76c70ebf9942f6bb891677d260fe16cb62 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
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


  parent reply	other threads:[~2020-10-04 11:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-16 11:16 bug#43446: Qt Apps cant make use of qtwayland due to QT_PLUGIN_PATH '= wrapping Brendan Tildesley
2020-10-04 10:46 ` bug#43446: EGL-Wayland Raghav Gururajan
2020-10-04 11:23 ` Brendan Tildesley [this message]
2020-10-04 12:43 ` bug#43446: Qt Apps cant make use of qtwayland due to QT_PLUGIN_PATH '= wrapping Ricardo Wurmus
2020-10-05  6:39   ` Brendan Tildesley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9e55f119-b476-cefe-c5b2-33c96d60015c@brendan.scot \
    --to=mail@brendan.scot \
    --cc=43446@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).