[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: libcloudproviders-minimal: Introduce minimal variant.
From: |
guix-commits |
Subject: |
03/05: gnu: libcloudproviders-minimal: Introduce minimal variant. |
Date: |
Fri, 15 Oct 2021 17:01:50 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 4dde05f61c90ffe3f389903fa9e6eacf2f38b9ca
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 15 16:42:20 2021 -0400
gnu: libcloudproviders-minimal: Introduce minimal variant.
* gnu/packages/gnome.scm (libcloudproviders-minimal): New minimal variant
that
doesn't require Inkscape to be built (through gtk-doc).
[configure-flags]: Remove argument, to be automatically determined.
(libcloudproviders): Rewrite in terms of libcloudproviders-minimal.
* gnu/packages/gtk.scm (gtk+)[inputs]{libcloudproviders}: Use the minimal
variant to prevent a cycle with Inkscape.
---
gnu/packages/gnome.scm | 38 ++++++++++++++++++++++++++++----------
gnu/packages/gtk.scm | 2 +-
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 43b1e0a..4515e17 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -338,9 +338,10 @@ Desktop. It is designed to be as simple as possible and
has some unique
features to enable users to create their discs easily and quickly.")
(license license:gpl2+)))
-(define-public libcloudproviders
+;;; Minimal variant, used to break a cycle with Inkscape.
+(define-public libcloudproviders-minimal
(package
- (name "libcloudproviders")
+ (name "libcloudproviders-minimal")
(version "0.3.1")
(source
(origin
@@ -354,10 +355,7 @@ features to enable users to create their discs easily and
quickly.")
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
- #:configure-flags
- (list
- "-Denable-gtk-doc=true")
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
(modify-phases %standard-phases
(add-after 'install 'move-doc
@@ -367,12 +365,9 @@ features to enable users to create their discs easily and
quickly.")
(mkdir-p (string-append doc "/share"))
(rename-file
(string-append out "/share/gtk-doc")
- (string-append doc "/share/gtk-doc"))
- #t))))))
+ (string-append doc "/share/gtk-doc"))))))))
(native-inputs
`(("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
@@ -386,6 +381,29 @@ services.")
(home-page
"https://csorianognome.wordpress.com/2015/07/07/cloud-providers/")
(license license:lgpl3+)))
+(define-public libcloudproviders
+ (package/inherit libcloudproviders-minimal
+ (name "libcloudproviders")
+ (version "0.3.1")
+ (arguments
+ (substitute-keyword-arguments (package-arguments
libcloudproviders-minimal)
+ ((#:phases phases '%standard-phases)
+ `(modify-phases %standard-phases
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t)))))))
+ (native-inputs
+ (append
+ `(("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc/stable))
+ (package-native-inputs libcloudproviders-minimal)))))
+
(define-public libgrss
(package
(name "libgrss")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c328472..79aac08 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1005,7 +1005,7 @@ application suites.")
gdk-pixbuf+svg
gdk-pixbuf))
("glib" ,glib)
- ("libcloudproviders" ,libcloudproviders)
+ ("libcloudproviders" ,libcloudproviders-minimal)
("libepoxy" ,libepoxy)
("libx11" ,libx11)
("libxcomposite" ,libxcomposite)