gnu: gnome-online-accounts: Split off 'lib' output.
gnu/packages/gnome.scm (gnome-online-accounts)[outputs]: Add 'lib'. [arguments]: Set the 'libdir' path to the 'out' output, and add a phase to ensure that libgoa gets installed in the 'lib' output. (evolution-data-server, gfbgraph, gnome-calendar, gnome-control-center, gnome-todo, libgdata, libzapojit): Use the 'lib' output of gnome-online-accounts. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
29a9eb9e1a
commit
14c297fde1
|
@ -389,7 +389,7 @@ (define-public libgdata
|
|||
("libsoup" ,libsoup)))
|
||||
(propagated-inputs
|
||||
`(("gcr" ,gcr)
|
||||
("gnome-online-accounts" ,gnome-online-accounts)
|
||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("liboauth" ,liboauth)
|
||||
("libxml2" ,libxml2)))
|
||||
(home-page "https://wiki.gnome.org/Projects/libgdata")
|
||||
|
@ -4941,7 +4941,23 @@ (define-public gnome-online-accounts
|
|||
(sha256
|
||||
(base32
|
||||
"1l8p1ghknmkmjpnpl7jr53j66qbzpikickzbmrz0aczyhq6pdy29"))))
|
||||
(outputs '("out" "lib"))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--libdir=" (assoc-ref %outputs "out") "/lib"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-libgoa-output
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((lib (assoc-ref outputs "lib")))
|
||||
(substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in")
|
||||
(("@prefix@") lib)
|
||||
(("@exec_prefix@") lib)
|
||||
(("@libdir@") (string-append lib "/lib"))
|
||||
(("@includedir@") (string-append lib "/include"))
|
||||
(("@datadir@") (string-append lib "/share")))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
|
@ -5038,7 +5054,7 @@ (define-public evolution-data-server
|
|||
(inputs
|
||||
`(("bdb" ,bdb)
|
||||
("gcr" ,gcr)
|
||||
("gnome-online-accounts" ,gnome-online-accounts)
|
||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("json-glib" ,json-glib)
|
||||
("libgweather" ,libgweather)
|
||||
("mit-krb5" ,mit-krb5)
|
||||
|
@ -5631,6 +5647,7 @@ (define-public gnome-control-center
|
|||
("gnome-bluetooth" ,gnome-bluetooth)
|
||||
("gnome-desktop" ,gnome-desktop)
|
||||
("gnome-online-accounts" ,gnome-online-accounts)
|
||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("gnome-settings-daemon" ,gnome-settings-daemon)
|
||||
("grilo" ,grilo)
|
||||
("ibus" ,ibus)
|
||||
|
@ -6300,7 +6317,7 @@ (define-public libzapojit
|
|||
("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("gnome-online-accounts" ,gnome-online-accounts)
|
||||
`(("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("json-glib" ,json-glib)
|
||||
("rest" ,rest)))
|
||||
(home-page "https://wiki.gnome.org/Projects/Zapojit")
|
||||
|
@ -6373,7 +6390,7 @@ (define-public gnome-calendar
|
|||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("evolution-data-server" ,evolution-data-server)
|
||||
("gnome-online-accounts" ,gnome-online-accounts)
|
||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
|
||||
(home-page "https://wiki.gnome.org/Apps/Calendar")
|
||||
(synopsis "GNOME's calendar application")
|
||||
|
@ -6425,7 +6442,7 @@ (define-public gnome-todo
|
|||
("libpeas" ,libpeas)
|
||||
("python-pygobject" ,python-pygobject)
|
||||
("evolution-data-server" ,evolution-data-server)
|
||||
("gnome-online-accounts" ,gnome-online-accounts)
|
||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
|
||||
(home-page "https://wiki.gnome.org/Apps/Todo")
|
||||
(synopsis "GNOME's ToDo Application")
|
||||
|
@ -6754,7 +6771,7 @@ (define-public gfbgraph
|
|||
("gobject-introspection" ,gobject-introspection)))
|
||||
(inputs
|
||||
`(("json-glib" ,json-glib)
|
||||
("gnome-online-accounts" ,gnome-online-accounts)
|
||||
("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
|
||||
("rest" ,rest)))
|
||||
(synopsis "GLib/GObject wrapper for the Facebook API")
|
||||
(description "This library allows you to use the Facebook API from
|
||||
|
|
Loading…
Reference in a new issue