mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 22:38:07 -05:00
gnu: bcachefs-tools: Remove obsolete phase & inputs.
* gnu/packages/file-systems.scm (bcachefs-tools)[inputs]: Remove coreutils-minimal, gawk, and util-linux, needed for an old version of the mount.bcachefs wrapper that is no longer present. [arguments]: Remove custom #:phases. The build system no longer explicitly builds & installs a shared library.
This commit is contained in:
parent
edf50dec80
commit
affea88cf5
1 changed files with 2 additions and 16 deletions
|
@ -649,11 +649,7 @@ (define-public bcachefs-tools
|
||||||
`(,util-linux "lib")
|
`(,util-linux "lib")
|
||||||
lz4
|
lz4
|
||||||
zlib
|
zlib
|
||||||
`(,zstd "lib")
|
`(,zstd "lib")))
|
||||||
;; Only for mount.bcachefs.sh.
|
|
||||||
coreutils-minimal
|
|
||||||
gawk
|
|
||||||
util-linux))
|
|
||||||
(home-page "https://bcachefs.org/")
|
(home-page "https://bcachefs.org/")
|
||||||
(synopsis "Tools to create and manage bcachefs file systems")
|
(synopsis "Tools to create and manage bcachefs file systems")
|
||||||
(description
|
(description
|
||||||
|
@ -677,17 +673,7 @@ (define-public bcachefs-tools/static
|
||||||
(substitute-keyword-arguments (package-arguments bcachefs-tools)
|
(substitute-keyword-arguments (package-arguments bcachefs-tools)
|
||||||
((#:make-flags make-flags)
|
((#:make-flags make-flags)
|
||||||
#~(append #$make-flags
|
#~(append #$make-flags
|
||||||
(list "LDFLAGS=-static")))
|
(list "LDFLAGS=-static")))))
|
||||||
((#:phases phases)
|
|
||||||
#~(modify-phases #$phases
|
|
||||||
(add-after 'unpack 'skip-shared-library
|
|
||||||
(lambda _
|
|
||||||
(substitute* "Makefile"
|
|
||||||
;; Building the shared library with ‘-static’ obviously fails…
|
|
||||||
(("^((all|install):.*)\\blib\\b(.*)" _ prefix suffix)
|
|
||||||
(string-append prefix suffix "\n"))
|
|
||||||
;; …as does installing a now non-existent file.
|
|
||||||
((".*\\$\\(INSTALL\\).* lib.*") ""))))))))
|
|
||||||
(inputs (modify-inputs (package-inputs bcachefs-tools)
|
(inputs (modify-inputs (package-inputs bcachefs-tools)
|
||||||
(prepend `(,eudev "static")
|
(prepend `(,eudev "static")
|
||||||
`(,keyutils "static")
|
`(,keyutils "static")
|
||||||
|
|
Loading…
Reference in a new issue