gnu: Remove librsvg-bootstrap.

librsvg is already a staging-level package, and the next version will no
longer bundle its dependencies, so we might as well drop it early.

* gnu/packages/gnome.scm (librsvg-bootstrap): Remove variable.
* gnu/packages/bittorrent.scm (deluge)[native-inputs]: Replace
LIBRSVG-BOOTSTRAP with LIBRSVG.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+-2)[propagated-inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Likewise.
This commit is contained in:
Marius Bakke 2022-08-11 21:22:50 +02:00
parent 32800e5eb6
commit b4a7f8c917
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
4 changed files with 4 additions and 25 deletions

View file

@ -525,7 +525,7 @@ (define-public deluge
(native-inputs
(list intltool python-wheel
(if (string-prefix? "x86_64-" (%current-system))
librsvg-bootstrap
librsvg
librsvg-2.40)))
;; TODO: Enable tests.
;; After "pytest-twisted" is packaged, HOME is set, and an X server is

View file

@ -289,7 +289,7 @@ (define* (emacs-byte-compile-directory dir)
libpng
zlib
(if (target-x86-64?)
librsvg-bootstrap
librsvg
librsvg-2.40)
libxpm
libxml2

View file

@ -3532,27 +3532,6 @@ (define-public librsvg
(home-page "https://wiki.gnome.org/LibRsvg")
(license license:lgpl2.1+)))
;; This copy of librsvg uses the bundled rust libraries. It is useful for
;; packages which have too many dependencies to be rebuilt as frequently
;; as the rust inputs are updated.
;; TODO: Remove this package and use packaged rust libraries!
(define-public librsvg-bootstrap
(package
(inherit librsvg)
(name "librsvg-bootstrap")
(source (origin
(inherit (package-source librsvg))
(modules '((guix build utils)))
(snippet
'(begin
(for-each delete-file (find-files "vendor" "\\.a$"))))))
(arguments
(substitute-keyword-arguments (package-arguments librsvg)
((#:vendor-dir _ "vendor") "vendor")
((#:cargo-inputs _) '())
((#:cargo-development-inputs _) '())))
(properties '((hidden? . #t)))))
(define-public librsvg-2.40
;; This is the last version implemented in C.
(package

View file

@ -872,7 +872,7 @@ (define-public gtk+-2
(propagated-inputs
(list atk cairo
(if (target-x86-64?)
librsvg-bootstrap
librsvg
librsvg-2.40)
glib pango))
(inputs
@ -971,7 +971,7 @@ (define-public gtk+
fontconfig
freetype
(if (target-x86-64?)
librsvg-bootstrap
librsvg
librsvg-2.40)
glib
libcloudproviders-minimal