mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-26 12:39:36 -05:00
gnu: tini: Update to 0.19.0 and provide tini-static.
* gnu/packages/docker.scm (tini): Update to 0.19.0. Remove trailing #t. [phases]: Remove argument. [configure-flags]: New argument, to clear the CMAKE_INSTALL_RPATH option.
This commit is contained in:
parent
0d2cbd6632
commit
352f23f71c
1 changed files with 6 additions and 11 deletions
|
@ -716,7 +716,7 @@ (define-public cqfd
|
|||
(define-public tini
|
||||
(package
|
||||
(name "tini")
|
||||
(version "0.18.0")
|
||||
(version "0.19.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -725,19 +725,14 @@ (define-public tini
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"))))
|
||||
"1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;tests require a Docker daemon
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-static-build
|
||||
;; Disable the static build as it fails to install, with
|
||||
;; the error: "No valid ELF RPATH or RUNPATH entry exists
|
||||
;; in the file".
|
||||
(lambda _
|
||||
(substitute* "CMakeLists.txt"
|
||||
((".*tini-static.*") ""))
|
||||
#t)))))
|
||||
;; 'tini-static' is a static binary, which leads CMake to fail with
|
||||
;; ‘file RPATH_CHANGE could not write new RPATH: ...’. Clear
|
||||
;; CMAKE_INSTALL_RPATH to avoid that problem.
|
||||
#:configure-flags '("-DCMAKE_INSTALL_RPATH=")))
|
||||
(home-page "https://github.com/krallin/tini")
|
||||
(synopsis "Tiny but valid init for containers")
|
||||
(description "Tini is an init program specifically designed for use with
|
||||
|
|
Loading…
Reference in a new issue