diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-05-07 15:55:33 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-05-07 16:43:48 -0500 |
commit | 130cb5d00508c606e15ad5fee19e549a261f68a3 (patch) | |
tree | 6ca6f06bfb1932cd21ba5720b0d2c8450452572b /pkgs/os-specific/linux/criu/default.nix | |
parent | c61d607340391bad86cd4167527874dd8d7552e5 (diff) |
criu: upgrade, hopefully fix Hydra build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/os-specific/linux/criu/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 349d690e4d199..8cb39927353c3 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }: -assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "criu-${version}"; - version = "1.2"; + version = "1.3-rc1"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "04xlnqvgbjd5wfmi97m5rr76a3agkz8g96hdyzhc6x8gd52bbg9y"; + sha256 = "00q3kyvaizg5x2zladj0mazmp69c9kg7nvlazcqf0w6bqp0y7sp0"; }; enableParallelBuilding = true; @@ -16,12 +15,11 @@ stdenv.mkDerivation rec { patchPhase = '' chmod +w ./scripts/gen-offsets.sh substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump + substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" ''; - buildPhase = '' - make config PREFIX=$out - make PREFIX=$out - ''; + configurePhase = "make config PREFIX=$out"; + buildPhase = "make PREFIX=$out"; installPhase = '' mkdir -p $out/etc/logrotate.d |