Merge pull request #105360 from primeos/criu-python3

criu: Switch to Python 3

authored by Michael Weiss and committed by GitHub 00617447 a6e78f01

+5 -3
+5 -3
pkgs/os-specific/linux/criu/default.nix
··· 1 { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables 2 , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig 3 - , which, python, makeWrapper, docbook_xml_dtd_45 }: 4 5 stdenv.mkDerivation rec { 6 pname = "criu"; ··· 12 }; 13 14 enableParallelBuilding = true; 15 - nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 ]; 16 - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python iptables ]; 17 18 postPatch = '' 19 substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" ··· 39 postFixup = '' 40 wrapProgram $out/bin/criu \ 41 --prefix PATH : ${lib.makeBinPath [ iptables ]} 42 ''; 43 44 meta = with stdenv.lib; {
··· 1 { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables 2 , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig 3 + , which, python3, makeWrapper, docbook_xml_dtd_45 }: 4 5 stdenv.mkDerivation rec { 6 pname = "criu"; ··· 12 }; 13 14 enableParallelBuilding = true; 15 + nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; 16 + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; 17 + propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; 18 19 postPatch = '' 20 substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" ··· 40 postFixup = '' 41 wrapProgram $out/bin/criu \ 42 --prefix PATH : ${lib.makeBinPath [ iptables ]} 43 + wrapPythonPrograms 44 ''; 45 46 meta = with stdenv.lib; {