mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: libsoup-minimal: Graft package propagating libxml2@2.14.
* gnu/packages/gnome.scm (libsoup-minimal/fixed, libsoup-minimal-2/fixed): Add package. (libsoup-minimal, libsoup-minimal-2)[replacement]: Graft libsoup-minimal/fixed. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
parent
17f3902886
commit
db6df56704
1 changed files with 22 additions and 2 deletions
|
@ -5201,6 +5201,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
|
||||||
;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
|
;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
|
||||||
(define-public libsoup-minimal
|
(define-public libsoup-minimal
|
||||||
(package
|
(package
|
||||||
|
(replacement libsoup-minimal/fixed)
|
||||||
(name "libsoup-minimal")
|
(name "libsoup-minimal")
|
||||||
(version "3.6.4")
|
(version "3.6.4")
|
||||||
(source (origin
|
(source (origin
|
||||||
|
@ -5250,7 +5251,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
|
||||||
libpsl
|
libpsl
|
||||||
nghttp2 ;for pkg-config
|
nghttp2 ;for pkg-config
|
||||||
`(,nghttp2 "lib")
|
`(,nghttp2 "lib")
|
||||||
libxml2-next
|
libxml2
|
||||||
sqlite
|
sqlite
|
||||||
zlib))
|
zlib))
|
||||||
(inputs
|
(inputs
|
||||||
|
@ -5263,10 +5264,18 @@ and the GLib main loop, to integrate well with GNOME applications.")
|
||||||
(license license:lgpl2.0+)
|
(license license:lgpl2.0+)
|
||||||
(properties '((upstream-name . "libsoup")))))
|
(properties '((upstream-name . "libsoup")))))
|
||||||
|
|
||||||
|
(define-public libsoup-minimal/fixed
|
||||||
|
(package
|
||||||
|
(inherit libsoup-minimal)
|
||||||
|
(propagated-inputs
|
||||||
|
(modify-inputs (package-propagated-inputs libsoup-minimal)
|
||||||
|
(replace "libxml2" libxml2-next)))))
|
||||||
|
|
||||||
;;; An older variant kept to build the 'rest' package.
|
;;; An older variant kept to build the 'rest' package.
|
||||||
(define-public libsoup-minimal-2
|
(define-public libsoup-minimal-2
|
||||||
(package
|
(package
|
||||||
(inherit libsoup-minimal)
|
(inherit libsoup-minimal)
|
||||||
|
(replacement libsoup-minimal-2/fixed)
|
||||||
(version "2.74.3")
|
(version "2.74.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -5292,10 +5301,21 @@ and the GLib main loop, to integrate well with GNOME applications.")
|
||||||
(("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
|
(("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(modify-inputs (package-native-inputs libsoup-minimal)
|
(modify-inputs (package-native-inputs libsoup-minimal)
|
||||||
(replace "vala" vala-0.52)))))
|
(replace "vala" vala-0.52)))
|
||||||
|
(propagated-inputs
|
||||||
|
(modify-inputs (package-propagated-inputs libsoup-minimal)
|
||||||
|
(replace "libxml2" libxml2)))))
|
||||||
|
|
||||||
|
(define-public libsoup-minimal-2/fixed
|
||||||
|
(package
|
||||||
|
(inherit libsoup-minimal-2)
|
||||||
|
(propagated-inputs
|
||||||
|
(modify-inputs (package-propagated-inputs libsoup-minimal-2)
|
||||||
|
(replace "libxml2" libxml2-next)))))
|
||||||
|
|
||||||
(define-public libsoup
|
(define-public libsoup
|
||||||
(package/inherit libsoup-minimal
|
(package/inherit libsoup-minimal
|
||||||
|
(replacement #f)
|
||||||
(name "libsoup")
|
(name "libsoup")
|
||||||
(outputs (cons "doc" (package-outputs libsoup-minimal)))
|
(outputs (cons "doc" (package-outputs libsoup-minimal)))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue