diff options
| author | Richard Marko <srk@48.io> | 2017-10-14 15:45:35 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2017-11-02 12:45:51 +0100 |
| commit | 22beeeab7684994aab938a849455686ea2f2509c (patch) | |
| tree | 9d99676853fe34dd44b72fd80194dd8fd7bd2042 /pkgs/os-specific/linux/criu | |
| parent | c34c737172acb3688717d17889a1f15183162e75 (diff) | |
| download | nixlib-22beeeab7684994aab938a849455686ea2f2509c.tar nixlib-22beeeab7684994aab938a849455686ea2f2509c.tar.gz nixlib-22beeeab7684994aab938a849455686ea2f2509c.tar.bz2 nixlib-22beeeab7684994aab938a849455686ea2f2509c.tar.lz nixlib-22beeeab7684994aab938a849455686ea2f2509c.tar.xz nixlib-22beeeab7684994aab938a849455686ea2f2509c.tar.zst nixlib-22beeeab7684994aab938a849455686ea2f2509c.zip | |
criu: 2.0 -> 2.12.1
Diffstat (limited to 'pkgs/os-specific/linux/criu')
| -rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 6f14e713139a..23d1c4821b87 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc -, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, pkgconfig +, xmlto, utillinux, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig , python }: stdenv.mkDerivation rec { name = "criu-${version}"; - version = "2.0"; + version = "2.12.1"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "1zqqshslcf503lqip89azp1zz0i8kb7v19b3dyp52izpak62c1z8"; + sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig docbook_xsl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; patchPhase = '' 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 "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" + 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. @@ -31,7 +32,9 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; - hardeningDisable = [ "stackprotector" ]; + hardeningDisable = [ "stackprotector" "fortify" ]; + # dropping fortify here as well as package uses it by default: + # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] installPhase = '' mkdir -p $out/etc/logrotate.d |