From 59948084487e20337e481daddbacb08251dab499 Mon Sep 17 00:00:00 2001
From: Victor Buttner <victor@0x23.dk>
Date: Fri, 2 Jun 2023 15:35:28 +0200
Subject: [PATCH] criu: add gnutar and gzip in PATH

These binaries are used for some tmpfs-related features of criu as seen here:
https://github.com/checkpoint-restore/criu/blob/fbe26923e85d7759e44666733a54c5ab951e8aa6/criu/filesystems.c#L420 .
These tmpfs-related features are used by e.g. docker checkpoint, see:
https://github.com/NixOS/nixpkgs/pull/230109 .
---
 pkgs/os-specific/linux/criu/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 228916bd7234..7940ce060e4d 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables
-, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2
-, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd
+, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2, gzip
+, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd, gnutar
 , buildPackages
 }:
 
@@ -107,7 +107,8 @@ stdenv.mkDerivation rec {
   postFixup = ''
     wrapProgram $out/bin/criu \
       --set-default CR_IPTABLES ${iptables}/bin/iptables \
-      --set-default CR_IP_TOOL ${iproute2}/bin/ip
+      --set-default CR_IP_TOOL ${iproute2}/bin/ip \
+      --prefix PATH : ${lib.makeBinPath [ gnutar gzip ]}
     wrapPythonPrograms
   '';