criu: Switch to Python 3

This also fixes "crit -h" and "import pycriu" from within an interactive
Python shell.
This commit is contained in:
Michael Weiss 2020-11-29 12:06:56 +01:00
parent b20cd4113f
commit 0421415824
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
, which, python, makeWrapper, docbook_xml_dtd_45 }:
, which, python3, makeWrapper, docbook_xml_dtd_45 }:
stdenv.mkDerivation rec {
pname = "criu";
@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python iptables ];
nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ];
propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ];
postPatch = ''
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram $out/bin/criu \
--prefix PATH : ${lib.makeBinPath [ iptables ]}
wrapPythonPrograms
'';
meta = with stdenv.lib; {