[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
112/180: gnu: libcloudproviders-minimal: Introduce minimal variant.
From: |
guix-commits |
Subject: |
112/180: gnu: libcloudproviders-minimal: Introduce minimal variant. |
Date: |
Fri, 29 Oct 2021 15:56:59 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit e81940b7b17f20fe2054475a1b1ceb8bca85da90
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).
[source]: Adjust URI.
[outputs]: Remove field.
[configure-flags]: Disable introspection, docs and vala bindings.
[phases]{move-doc}: Move phase to ...
(libcloudproviders)[phases]: ... here.
Rewrite in terms of libcloudproviders-minimal. The "doc" output is moved
here.
[configure-flags]: Clear inherited flags and enable doc.
* gnu/packages/gtk.scm (gtk+)[inputs]{libcloudproviders}: Use the minimal
variant to prevent a cycle with Inkscape.
---
gnu/packages/gnome.scm | 60 ++++++++++++++++++++++++++++++--------------------
gnu/packages/gtk.scm | 2 +-
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c4226e8..093a1ce 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>
-;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
@@ -338,41 +338,28 @@ 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
(method url-fetch)
(uri
- (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
+ (string-append "mirror://gnome/sources/libcloudproviders/"
+ (version-major+minor version)
+ "/libcloudproviders-" version ".tar.xz"))
(sha256
(base32 "0aars24myf6n8b8hm1n12hsgcm54097kpbpm4ba31zp1l4y22qs7"))))
(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")
- #: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))))))
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags (list "-Dintrospection=false"
+ "-Denable-gtk-doc=false"
+ "-Dvapigen=false")))
(native-inputs
`(("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
@@ -386,6 +373,31 @@ 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")
+ (outputs (cons "doc" (package-outputs libcloudproviders-minimal)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments
libcloudproviders-minimal)
+ ((#:configure-flags _)
+ '(list "-Denable-gtk-doc=true")) ;false by default
+ ((#: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")))))))))
+ (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 a515bca..e92c6b1 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)
- 89/180: aux-files: sitecustomize: Cleanup and add explanatory comments., (continued)
- 89/180: aux-files: sitecustomize: Cleanup and add explanatory comments., guix-commits, 2021/10/29
- 90/180: gnu: glade3: Remove sitecustomize.py workaround., guix-commits, 2021/10/29
- 49/180: gnu: e2fsprogs: Update to 1.46.4., guix-commits, 2021/10/29
- 58/180: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/29
- 63/180: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/29
- 80/180: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/29
- 85/180: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/29
- 79/180: gnu: diffutils: Fix signal processing., guix-commits, 2021/10/29
- 93/180: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/29
- 94/180: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/29
- 112/180: gnu: libcloudproviders-minimal: Introduce minimal variant.,
guix-commits <=
- 113/180: gnu: gusb-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 115/180: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/29
- 117/180: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/29
- 120/180: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/29
- 129/180: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/29
- 87/180: gnu: gdb: Normalize indentation., guix-commits, 2021/10/29
- 109/180: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 114/180: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/29
- 121/180: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/29
- 135/180: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/29