diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-12-05 16:01:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 16:01:55 +0100 |
| commit | 00617447b268f11223654b4898157cec07423e16 (patch) | |
| tree | a73bdfe6b699b23e90b96caef4f8627860ba1c18 /pkgs/os-specific | |
| parent | a6e78f015cda426447ee0771377c4a810d366988 (diff) | |
| parent | 0421415824531434dea9271887beb9e0898856c3 (diff) | |
Merge pull request #105360 from primeos/criu-python3
criu: Switch to Python 3
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 92fabffcd029..abc11a4a5f06 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -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; { |