From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewI3p-000867-Rt for guix-patches@gnu.org; Wed, 14 Mar 2018 21:52:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewI3m-0007nL-IS for guix-patches@gnu.org; Wed, 14 Mar 2018 21:52:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:54178) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewI3m-0007nB-DP for guix-patches@gnu.org; Wed, 14 Mar 2018 21:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ewI3m-0005nC-08 for guix-patches@gnu.org; Wed, 14 Mar 2018 21:52:02 -0400 Subject: [bug#30765] [PATCH] gnu: qtox: Propagate qtsvg and fix misplaced comma (unquote). Resent-Message-ID: From: Diego Nicola Barbato References: <87vae3r38d.fsf@GlaDOS.home> <87h8plnynb.fsf@gnu.org> <87o9jtibjz.fsf@fastmail.com> Date: Thu, 15 Mar 2018 02:51:34 +0100 In-Reply-To: <87o9jtibjz.fsf@fastmail.com> (Marius Bakke's message of "Mon, 12 Mar 2018 16:00:16 +0100") Message-ID: <87r2omqf6h.fsf@GlaDOS.home> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 30765@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Ludovic Court=C3=A8s writes: > >> Hello Diego, >> >> Diego Nicola Barbato skribis: >> >>> This patch fixes an issue where qTox failed to display some icons by >>> moving qtsvg to propagated-inputs. >>> I also took the liberty of fixing a misplaced comma (unquote). >> >> The patch LGTM, but can you explain why propagating qtsvg allows icons >> to be displayed? > > There is some discussion about this in . > > In short, the problem is that Qt icons hide under the search path > QT_PLUGIN_PATH, which is not automatically set up for dependent programs > (see ). > > Diego: can you try to wrap qTox as in commit > 990e93fce16a83e1603b9ec28123ec3edc7ea787 instead of propagating? Thanks for the feedback. I have rewritten the patch according to your suggestion: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-qtox-Wrap-executable-and-fix-misplaced-comma-unq.patch >From 17c78d051b723b3fb9cabec724a32d151b00be68 Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Thu, 15 Mar 2018 02:19:51 +0100 Subject: [PATCH] gnu: qtox: Wrap executable and fix misplaced comma (unquote). * gnu/packages/messaging.scm (qtox)[arguments]: Add phase "wrap-executable". [inputs]: Fix misplaced comma (unquote). --- gnu/packages/messaging.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b6323c39b..ae489e158 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -874,10 +874,18 @@ instant messenger with audio and video chat capabilities.") (("__DATE__") "\"\"") (("__TIME__") "\"\"") (("TIMESTAMP") "\"\"")) - #t))))) + #t)) + ;; Ensure that icons are found at runtime. + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/qtox") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append (assoc-ref inputs "qtsvg") + "/lib/qt5/plugins/")))))))))) (inputs `(("ffmpeg" ,ffmpeg) - ("filteraudio", filteraudio) + ("filteraudio" ,filteraudio) ("glib" ,glib) ("gtk+" ,gtk+-2) ("libsodium" ,libsodium) -- 2.16.2 --=-=-=--