me/guix
Archived
1
0
Fork 0
Code Activity

gnu: tini: Update to 0.19.0 and provide tini-static.

Browse source 
* 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:
Maxim Cournoyer 2021-06-09 22:43:55 -04:00
parent 0d2cbd6632
commit 352f23f71c
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/docker.scm
View file

@ -716,7 +716,7 @@ defined in a per-project configuration file.")
(define-public tini (define-public tini
(package (package
(name "tini") (name "tini")
(version "0.18.0") (version "0.19.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -725,19 +725,14 @@ defined in a per-project configuration file.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn")))) "1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ;tests require a Docker daemon `(#:tests? #f ;tests require a Docker daemon
#:phases (modify-phases %standard-phases ;; 'tini-static' is a static binary, which leads CMake to fail with
(add-after 'unpack 'disable-static-build ;; ‘file RPATH_CHANGE could not write new RPATH: ...’. Clear
;; Disable the static build as it fails to install, with ;; CMAKE_INSTALL_RPATH to avoid that problem.
;; the error: "No valid ELF RPATH or RUNPATH entry exists #:configure-flags '("-DCMAKE_INSTALL_RPATH=")))
;; in the file".
(lambda _
(substitute* "CMakeLists.txt"
((".*tini-static.*") ""))
#t)))))
(home-page "https://github.com/krallin/tini") (home-page "https://github.com/krallin/tini")
(synopsis "Tiny but valid init for containers") (synopsis "Tiny but valid init for containers")
(description "Tini is an init program specifically designed for use with (description "Tini is an init program specifically designed for use with