diff options
| author | Zane van Iperen <zane@zanevaniperen.com> | 2021-06-11 14:19:10 +1000 |
|---|---|---|
| committer | Zane van Iperen <zane@zanevaniperen.com> | 2021-06-11 18:03:15 +1000 |
| commit | 9c40b6f375f0ab2220b4c3717671fa5ebc023044 (patch) | |
| tree | 2a1588845649b7c8dfdb5e0fe4c68c418ecf322b /pkgs/applications/virtualization/tini | |
| parent | e14843556cb4ed2286c6752a32abf85beec0e19c (diff) | |
| download | nixlib-9c40b6f375f0ab2220b4c3717671fa5ebc023044.tar nixlib-9c40b6f375f0ab2220b4c3717671fa5ebc023044.tar.gz nixlib-9c40b6f375f0ab2220b4c3717671fa5ebc023044.tar.bz2 nixlib-9c40b6f375f0ab2220b4c3717671fa5ebc023044.tar.lz nixlib-9c40b6f375f0ab2220b4c3717671fa5ebc023044.tar.xz nixlib-9c40b6f375f0ab2220b4c3717671fa5ebc023044.tar.zst nixlib-9c40b6f375f0ab2220b4c3717671fa5ebc023044.zip | |
tini: don't explicitly depend on glibc
* Fixes pkgsStatic.tini build. * Use postPatch instead of patchPhase * Moves glibc dependency into docker.docker-tini
Diffstat (limited to 'pkgs/applications/virtualization/tini')
| -rw-r--r-- | pkgs/applications/virtualization/tini/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index dd7bcb19978c..76668301c6bb 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, glibc }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.19.0"; @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; - patchPhase = "sed -i /tini-static/d CMakeLists.txt"; + postPatch = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; nativeBuildInputs = [ cmake ]; - buildInputs = [ glibc glibc.static ]; meta = with lib; { description = "A tiny but valid init for containers"; |