unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: Leo Famulari <leo@famulari.name>
Cc: 52486@debbugs.gnu.org, Josselin Poiret <dev@jpoiret.xyz>
Subject: [bug#52486] [PATCH v2 2/2] gnu: deluge: Remove reference of build-time librsvg
Date: Tue, 14 Dec 2021 20:17:13 +0100	[thread overview]
Message-ID: <20211214191713.18665-3-dev@jpoiret.xyz> (raw)
In-Reply-To: <20211214191713.18665-1-dev@jpoiret.xyz>

* gnu/packages/bittorrent.scm (deluge): Do it.
---
 gnu/packages/bittorrent.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 6c6d01991a..2a59b94f92 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -564,9 +564,19 @@ (define-public deluge
                (("names='ngettext'") "names=['ngettext']"))
              #t))
          (add-after 'install 'wrap
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
-                   (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
+                   (gi-typelib-path
+                    (string-join (filter
+                                  (lambda (x) (not (string-prefix?
+                                                    (assoc-ref
+                                                     (or native-inputs inputs)
+                                                     "librsvg")
+                                                    x)))
+                                  (string-split
+                                   (getenv "GI_TYPELIB_PATH")
+                                   #\:))
+                                 ":")))
                (for-each
                 (lambda (program)
                   (wrap-program program
-- 
2.34.0





  parent reply	other threads:[~2021-12-14 19:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-14 17:21 [bug#52486] [PATCH] gnu: deluge: Move librsvg to native inputs Josselin Poiret via Guix-patches via
2021-12-14 17:56 ` Leo Famulari
2021-12-14 19:17   ` [bug#52486] [PATCH v2 0/2] Fix deluge propagating a librsvg incompatible with that of gtk+ Josselin Poiret via Guix-patches via
2021-12-14 19:17     ` [bug#52486] [PATCH v2 1/2] gnu: deluge: Move librsvg to native inputs Josselin Poiret via Guix-patches via
2021-12-14 19:17     ` Josselin Poiret via Guix-patches via [this message]
2022-01-16 17:58       ` [bug#52486] [PATCH v2 2/2] gnu: deluge: Remove reference of build-time librsvg Leo Famulari
2022-01-16 21:41         ` [bug#52486] [PATCH] gnu: deluge: Move librsvg to native inputs Brice Waegeneire
2022-01-16 10:52     ` bug#52486: " Brice Waegeneire
2022-01-16 10:52     ` [bug#52486] " Brice Waegeneire

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=20211214191713.18665-3-dev@jpoiret.xyz \
    --to=guix-patches@gnu.org \
    --cc=52486@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=leo@famulari.name \
    /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).