diff options
author | Florian Klink <flokli@flokli.de> | 2020-11-26 22:16:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-26 22:16:53 +0100 |
commit | 1cdbdc3278f77c930ff31527f6012a54171b30cd (patch) | |
tree | 8a04dbfecf6eb8675d846453289a67eae5b9652b /pkgs/applications/virtualization | |
parent | 60efefaed09d1369b97d35639f7a5310ded5fa26 (diff) | |
parent | 50e24b8e0aed6132d4d5a5768e85502314855834 (diff) |
Merge pull request #104545 from zowoq/runc
runc: add wrapper for systemd
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/runc/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 1a7935dcf7d5..c3882ae9472e 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -9,6 +9,8 @@ , apparmor-parser , libseccomp , libselinux +, makeWrapper +, procps , nixosTests }: @@ -26,7 +28,7 @@ buildGoPackage rec { goPackagePath = "github.com/opencontainers/runc"; outputs = [ "out" "man" ]; - nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; + nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; @@ -43,6 +45,9 @@ buildGoPackage rec { installPhase = '' install -Dm755 runc $out/bin/runc installManPage man/*/*.[1-9] + wrapProgram $out/bin/runc \ + --prefix PATH : ${lib.makeBinPath [ procps ]} \ + --prefix PATH : /run/current-system/systemd/bin ''; passthru.tests = { inherit (nixosTests) cri-o docker podman; }; |