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: 52486@debbugs.gnu.org
Cc: Josselin Poiret <dev@jpoiret.xyz>
Subject: [bug#52486] [PATCH] gnu: deluge: Move librsvg to native inputs.
Date: Tue, 14 Dec 2021 18:21:51 +0100	[thread overview]
Message-ID: <20211214172151.28831-1-dev@jpoiret.xyz> (raw)

Grepping the source code shows that librsvg is run by the
builder, and not by deluge itself.  This fixes propagation conflicting
with gtk+'s librsvg.  For now, use the C variant to build on all archs.
-- >8 --

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

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 0dcb1ee991..5513878fc0 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -528,7 +528,6 @@ (define-public deluge
     (build-system python-build-system)
     (propagated-inputs
      `(("gtk+" ,gtk+)
-       ("librsvg" ,librsvg)
        ("libtorrent" ,libtorrent-rasterbar)
        ("python-pycairo" ,python-pycairo)
        ("python-chardet" ,python-chardet)
@@ -545,7 +544,7 @@ (define-public deluge
        ("python-twisted" ,python-twisted)
        ("python-zope-interface" ,python-zope-interface)))
     (native-inputs
-     (list intltool python-wheel))
+     (list intltool python-wheel librsvg-2.40))
     ;; TODO: Enable tests.
     ;; After "pytest-twisted" is packaged, HOME is set, and an X server is
     ;; started, some of the tests still fail.  There are likely some tests
-- 
2.34.0





             reply	other threads:[~2021-12-14 17:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-14 17:21 Josselin Poiret via Guix-patches via [this message]
2021-12-14 17:56 ` [bug#52486] [PATCH] gnu: deluge: Move librsvg to native inputs 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     ` [bug#52486] [PATCH v2 2/2] gnu: deluge: Remove reference of build-time librsvg Josselin Poiret via Guix-patches via
2022-01-16 17:58       ` 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=20211214172151.28831-1-dev@jpoiret.xyz \
    --to=guix-patches@gnu.org \
    --cc=52486@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    /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).