[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/15: gnu: btrfs-progs: Make the python-sphinx input conditional.
From: |
guix-commits |
Subject: |
08/15: gnu: btrfs-progs: Make the python-sphinx input conditional. |
Date: |
Thu, 18 May 2023 14:07:08 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 92a899ed985c60ffc199d8465ddbc03d285365ce
Author: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
AuthorDate: Wed May 10 18:39:24 2023 +0200
gnu: btrfs-progs: Make the python-sphinx input conditional.
* gnu/packages/linux.scm (btrfs-progs) [native-inputs]:
Make the python-sphinx input conditional.
[arguments]: Conditionally add --disable-documentation to
configure flags.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/linux.scm | 39 +++++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a0248106b6..38d7a041e0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5927,9 +5927,18 @@ and copy/paste text in the console and in xterm.")
(arguments
(list
#:configure-flags
- ;; The ‘Python support’ was never actually installed by previous
- ;; versions of this package, but did prevent cross-compilation.
- #~(list "--disable-python")
+ #~(append
+ ;; Without --disable-documentation, it complains about missing
+ ;; python-sphinx on systems where this package isn't available
+ ;; (because it requires Rust).
+ (if #$@(member (%current-system)
+ (package-transitive-supported-systems
+ python-sphinx))
+ '()
+ (list "--disable-documentation"))
+ ;; The ‘Python support’ was never actually installed by previous
+ ;; versions of this package, but did prevent cross-compilation.
+ (list "--disable-python"))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
@@ -5968,15 +5977,21 @@ and copy/paste text in the console and in xterm.")
`(,zlib "static")
`(,zstd "lib")
`(,zstd "static")))
- (native-inputs (list pkg-config
- python-sphinx ;for building documentation
- acl ;for tests
- lvm2 ;for dmsetup
- grep ;need Perl regexp support
- libaio
- liburing
- util-linux ;for fallocate
- which))
+ (native-inputs
+ (append
+ ;; For building documentation. Since python-sphinx requires Rust, add
+ ;; it conditionally depending on such support.
+ (if (supported-package? python-sphinx)
+ (list python-sphinx)
+ '())
+ (list pkg-config
+ acl ;for tests
+ lvm2 ;for dmsetup
+ grep ;need Perl regexp support
+ libaio
+ liburing
+ util-linux ;for fallocate
+ which)))
(home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page")
(synopsis "Create and manage btrfs copy-on-write file systems")
(description
- branch master updated (5b700945fb -> 2344ccee2f), guix-commits, 2023/05/18
- 06/15: gnu: btrfs-progs: Run 'guix style' over the package., guix-commits, 2023/05/18
- 03/15: gnu: libfive: Fix install and wrap Studio., guix-commits, 2023/05/18
- 05/15: gnu: libfive: Generate bindings instead of using pre-generated ones., guix-commits, 2023/05/18
- 08/15: gnu: btrfs-progs: Make the python-sphinx input conditional.,
guix-commits <=
- 02/15: refresh: Honor '--key-server'., guix-commits, 2023/05/18
- 01/15: doc: Change '--with-configure-flag' example to something that works., guix-commits, 2023/05/18
- 04/15: gnu: libfive: Add Python bindings., guix-commits, 2023/05/18
- 07/15: gnu: btrfs-progs: Use new style inputs and gexps., guix-commits, 2023/05/18
- 09/15: gnu: btrfs-progs: Update to 6.3., guix-commits, 2023/05/18
- 10/15: gnu: swaylock: Add linux-pam to inputs., guix-commits, 2023/05/18
- 13/15: gnu: f3d: Update to 2.0.0., guix-commits, 2023/05/18
- 14/15: style: Add 'arguments' styling rule., guix-commits, 2023/05/18
- 15/15: news: Add entry to 'guix style -S arguments'., guix-commits, 2023/05/18
- 11/15: gnu: cxxopts: Update to 3.1.1., guix-commits, 2023/05/18