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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-17 06:14:55 +00:00
committed by GitHub
parent 0d489fc753 3ed237717a
commit cd9df16806
94 changed files with 777 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/criu/default.nix
+3 -3
View File
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ];
postPatch = ''
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 ./Documentation/Makefile \
--replace "2>/dev/null" "" \
--replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
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
'';