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

Merge pull request #61745 from abbradar/criu

Browse Source 
criu: 3.9 -> 3.11
This commit is contained in:
Austin Seipp 2019-05-21 10:13:35 -05:00 committed by GitHub
commit f9b8ee3dd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,19 @@
{ stdenv, fetchurl, protobuf, protobufc, asciidoc { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
, python }: , which, python, makeWrapper, docbook_xml_dtd_45 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "criu-${version}"; name = "criu-${version}";
version = "3.9"; version = "3.11";
src = fetchurl { src = fetchurl {
url = "https://download.openvz.org/criu/${name}.tar.bz2"; url = "https://download.openvz.org/criu/${name}.tar.bz2";
sha256 = "0l71lmklr42pc2bj37pkp7y8va8bx42n9f6i4q4idsx4wrdd75fx"; sha256 = "03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig docbook_xsl ]; nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python iptables ];
postPatch = '' postPatch = ''
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
@ -23,17 +23,22 @@ stdenv.mkDerivation rec {
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
''; '';
buildPhase = "make PREFIX=$out"; makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ];
makeFlags = "PREFIX=$(out)"; outputs = [ "out" "dev" "man" ];
preBuild = ''
# No idea why but configure scripts break otherwise.
export SHELL=""
'';
hardeningDisable = [ "stackprotector" "fortify" ]; hardeningDisable = [ "stackprotector" "fortify" ];
# dropping fortify here as well as package uses it by default: # dropping fortify here as well as package uses it by default:
# command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
installPhase = '' postFixup = ''
mkdir -p $out/etc/logrotate.d wrapProgram $out/bin/criu \
make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto --prefix PATH : ${lib.makeBinPath [ iptables ]}
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {