summary refs log tree commit diff
path: root/pkgs/os-specific/linux/criu/default.nix
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-10-07 13:24:29 +0200
committerJan Tojnar <jtojnar@gmail.com>2017-10-07 23:39:15 +0200
commit08b283b37e02a02ab5767de9be3ddd41db923cf1 (patch)
treefafd6ba6621bb2abd10f5abdb703f2c390c476ea /pkgs/os-specific/linux/criu/default.nix
parent7c690aec1619fe85ef5c8bfbf05374597aceff1d (diff)
downloadnixpkgs-08b283b37e02a02ab5767de9be3ddd41db923cf1.tar
nixpkgs-08b283b37e02a02ab5767de9be3ddd41db923cf1.tar.gz
nixpkgs-08b283b37e02a02ab5767de9be3ddd41db923cf1.tar.bz2
nixpkgs-08b283b37e02a02ab5767de9be3ddd41db923cf1.tar.lz
nixpkgs-08b283b37e02a02ab5767de9be3ddd41db923cf1.tar.xz
nixpkgs-08b283b37e02a02ab5767de9be3ddd41db923cf1.tar.zst
nixpkgs-08b283b37e02a02ab5767de9be3ddd41db923cf1.zip
criu: Rely on XML_CATALOG_FILES variable
Diffstat (limited to 'pkgs/os-specific/linux/criu/default.nix')
-rw-r--r--pkgs/os-specific/linux/criu/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 20b64907c22..6f14e713139 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -12,14 +12,13 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig docbook_xsl ];
   buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap 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 "--skip-validation" "--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" ""
     ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto