diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-08-27 19:42:02 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2025-09-04 11:13:05 +0200 |
| commit | db6df56704779d95bfddf4b824523b2929a4a1cf (patch) | |
| tree | 48da3f35d76abfe42f8cfa4161f0237d5a79195d /gnu | |
| parent | 17f3902886526703e3d4b65b0a63a9a4ce7b1169 (diff) | |
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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gnome.scm | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5f84bc82ec0..e5b22f71d3d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5201,6 +5201,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.") ;;; A minimal version of libsoup used to prevent a cycle with Inkscape. (define-public libsoup-minimal (package + (replacement libsoup-minimal/fixed) (name "libsoup-minimal") (version "3.6.4") (source (origin @@ -5250,7 +5251,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.") libpsl nghttp2 ;for pkg-config `(,nghttp2 "lib") - libxml2-next + libxml2 sqlite zlib)) (inputs @@ -5263,10 +5264,18 @@ and the GLib main loop, to integrate well with GNOME applications.") (license license:lgpl2.0+) (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. (define-public libsoup-minimal-2 (package (inherit libsoup-minimal) + (replacement libsoup-minimal-2/fixed) (version "2.74.3") (source (origin (method url-fetch) @@ -5292,10 +5301,21 @@ and the GLib main loop, to integrate well with GNOME applications.") (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))) (native-inputs (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 (package/inherit libsoup-minimal + (replacement #f) (name "libsoup") (outputs (cons "doc" (package-outputs libsoup-minimal))) (arguments |