ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libsoup: Simplify inputs.

Browse source 
Obtained by running "guix style --input-simplification=always" and by
using 'modify-inputs' instead of list primitives.

* gnu/packages/gnome.scm (libsoup-minimal, libsoup-minimal-2, libsoup):
Simplify inputs.
This commit is contained in:
Ludovic Courtès 2021-12-05 23:53:40 +01:00
parent 0dc42f5bbf
commit c162f8582b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gnu/packages/gnome.scm
View file

@ -5033,29 +5033,28 @@ (define-public libsoup-minimal
(substitute* "tests/hsts-db-test.c" (substitute* "tests/hsts-db-test.c"
((".*/hsts-db/subdomains.*") ""))))))) ((".*/hsts-db/subdomains.*") "")))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ;for glib-mkenums (list `(,glib "bin") ;for glib-mkenums
("gobject-introspection" ,gobject-introspection) gobject-introspection
("intltool" ,intltool) intltool
("pkg-config" ,pkg-config) pkg-config
("python" ,python-wrapper) python-wrapper
("vala" ,vala) vala
("curl" ,curl) curl
("gnutls" ,gnutls) ;for 'certtool' gnutls ;for 'certtool'
("httpd" ,httpd))) httpd))
(propagated-inputs (propagated-inputs
;; libsoup-3.0.pc refers to all of these (except where otherwise noted) ;; libsoup-3.0.pc refers to all of these (except where otherwise noted)
`(("brotli" ,brotli) (list brotli
("glib" ,glib) glib
("glib-networking" ,glib-networking) ; for GIO runtime modules glib-networking ; for GIO runtime modules
("libpsl" ,libpsl) libpsl
("nghttp2" ,nghttp2) ;for pkg-config nghttp2 ;for pkg-config
("nghttp2:lib" ,nghttp2 "lib") `(,nghttp2 "lib")
("libxml2" ,libxml2) libxml2
("sqlite" ,sqlite) sqlite
("zlib" ,zlib))) zlib))
(inputs (inputs
`(("mit-krb5" ,mit-krb5) (list mit-krb5 samba/fixed)) ; For ntlm_auth support
("ntlm_auth" ,samba/fixed))) ; For ntlm_auth support
(home-page "https://wiki.gnome.org/Projects/libsoup") (home-page "https://wiki.gnome.org/Projects/libsoup")
(synopsis "GLib-based HTTP Library") (synopsis "GLib-based HTTP Library")
(description (description
@ -5086,8 +5085,8 @@ (define-public libsoup-minimal-2
(substitute* "tests/meson.build" (substitute* "tests/meson.build"
(("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))) (("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
(native-inputs (native-inputs
(cons `("vala" ,vala-0.52) (modify-inputs (package-native-inputs libsoup-minimal)
(delete "vala" (package-native-inputs libsoup-minimal)))))) (replace "vala" vala-0.52)))))
(define-public libsoup (define-public libsoup
(package/inherit libsoup-minimal (package/inherit libsoup-minimal
@ -5116,9 +5115,8 @@ (define-public libsoup
(string-append doc "/share/gtk-doc")) (string-append doc "/share/gtk-doc"))
(delete-file-recursively (delete-file-recursively
(string-append out "/share/gtk-doc"))))))))) (string-append out "/share/gtk-doc")))))))))
(native-inputs (append `(("docbook-xml" ,docbook-xml-4.1.2) (native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
("gtk-doc" ,gtk-doc)) (prepend docbook-xml-4.1.2 gtk-doc)))))
(package-native-inputs libsoup-minimal)))))
(define-public libsecret (define-public libsecret
(package (package