diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-11-29 12:06:56 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-11-29 17:17:20 +0100 |
| commit | 0421415824531434dea9271887beb9e0898856c3 (patch) | |
| tree | d8b7abbacac52e62423354f91bb1bf1389b9c94a | |
| parent | b20cd4113f2386ec84eb9a2f84e3a8c190f6a5d0 (diff) | |
| download | nixpkgs-0421415824531434dea9271887beb9e0898856c3.tar nixpkgs-0421415824531434dea9271887beb9e0898856c3.tar.gz nixpkgs-0421415824531434dea9271887beb9e0898856c3.tar.bz2 nixpkgs-0421415824531434dea9271887beb9e0898856c3.tar.lz nixpkgs-0421415824531434dea9271887beb9e0898856c3.tar.xz nixpkgs-0421415824531434dea9271887beb9e0898856c3.tar.zst nixpkgs-0421415824531434dea9271887beb9e0898856c3.zip | |
criu: Switch to Python 3
This also fixes "crit -h" and "import pycriu" from within an interactive Python shell.
| -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 92fabffcd02..abc11a4a5f0 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; { |