summary refs log tree commit diff
path: root/pkgs/os-specific/linux/criu/default.nix
diff options
context:
space:
mode:
authorHerwig Hochleitner <herwig@bendlas.net>2018-01-28 20:36:51 +0100
committerHerwig Hochleitner <herwig@bendlas.net>2018-01-30 00:03:11 +0100
commit499b3edb306988d9ec91db50174aa85a896e585b (patch)
tree83d66b355d4262070c3449a415facb85718737ec /pkgs/os-specific/linux/criu/default.nix
parent34c36ab2daea13d6e985922742cc94476f9dce6e (diff)
downloadnixpkgs-499b3edb306988d9ec91db50174aa85a896e585b.tar
nixpkgs-499b3edb306988d9ec91db50174aa85a896e585b.tar.gz
nixpkgs-499b3edb306988d9ec91db50174aa85a896e585b.tar.bz2
nixpkgs-499b3edb306988d9ec91db50174aa85a896e585b.tar.lz
nixpkgs-499b3edb306988d9ec91db50174aa85a896e585b.tar.xz
nixpkgs-499b3edb306988d9ec91db50174aa85a896e585b.tar.zst
nixpkgs-499b3edb306988d9ec91db50174aa85a896e585b.zip
criu: 2.12.1 -> 3.7
cc @thoughtpolice
Diffstat (limited to 'pkgs/os-specific/linux/criu/default.nix')
-rw-r--r--pkgs/os-specific/linux/criu/default.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 4ceb397d9f8..4ef162e56c7 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,30 +4,23 @@
 
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "2.12.1";
+  version = "3.7";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
+    sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq";
   };
 
-  patches = [ ./criu-2.12.1-glibc-2.26.patch ];
-
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig docbook_xsl ];
   buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
 
   postPatch = ''
-    chmod +w ./scripts/gen-offsets.sh
-    substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
     substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
     substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
     substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
     substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
     ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
-
-    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-    sed 1i'#include <sys/sysmacros.h>' -i criu/include/util.h
   '';
 
   buildPhase = "make PREFIX=$out";