public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105360 from primeos/criu-python3

Browse Source 
criu: Switch to Python 3
This commit is contained in:
Michael Weiss 2020-12-05 16:01:55 +01:00 committed by GitHub
commit 00617447b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/criu/default.nix
View File

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