[PATCH nixpkgs v2 4/8] chromiumOSPackages.vm_protos: drop GN patch

Alyssa Ross
2021-05-29T14:42:29Z

The missing dependency has been added upstream.

Reviewed-by: Alyssa Ross <hi@alyssa.is>
Tested-by: Alyssa Ross <hi@alyssa.is>
---
...03-vm_tools-proto-fix-parallel-build.patch | 39 -------------------
.../linux/chromium-os/vm_protos/default.nix | 2 -
2 files changed, 41 deletions(-)
delete mode 100644 pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch

diff --git a/pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch b/pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch
deleted file mode 100644
index 93fa535ac7e..00000000000
--- a/pkgs/os-specific/linux/chromium-os/vm_protos/0003-vm_tools-proto-fix-parallel-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From dfed9458bf7abc1dc8f33a3e16ee179cde88e4e2 Mon Sep 17 00:00:00 2001
-From: Alyssa Ross <hi@alyssa.is>
-Date: Tue, 2 Jun 2020 00:21:08 +0000
-Subject: [PATCH 3/6] vm_tools: proto: fix parallel build
-
-fuzzer-protos depends on vm-crash-rpcs, but this dependency wasn't
-declared, causing build failures like the following:
-
-[26/52] CXX obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o
-FAILED: obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o
-c++ -MMD -MF obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Igen/include -I../../common-mk -I/usr/include -Igen -Igen -Igen -Igen -Wall -Wunused -Wno-unused-parameter -Wunreachable-code -ggdb3 -fstack-protector-strong -Wformat=2 -fvisibility=internal -Wa,--noexecstack -Wimplicit-fallthrough -Werror --sysroot= -fPIE -fvisibility=default -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28.1/include -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev/include -I/nix/store/mfpg3sk5vk9rm99hbpmd3dgvxqybd391-protobuf-3.8.0/include -pthread -I/nix/store/pjl2q3lny3c18ypqjcv0q3akyq89hg2i-grpc-1.28.1/include -I/nix/store/hya0y6slws66h99njc2yiz02irfv4n62-openssl-1.1.1g-dev/include -I/nix/store/mfpg3sk5vk9rm99hbpmd3dgvxqybd391-protobuf-3.8.0/include -Wno-unreachable-code -std=gnu++14 -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -Wno-psabi -c gen/include/vm_protos/proto_bindings/fuzzer.grpc.pb.cc -o obj/out/Release/gen/include/vm_protos/proto_bindings/libfuzzer-protos.fuzzer.grpc.pb.o
-In file included from gen/include/vm_protos/proto_bindings/fuzzer.grpc.pb.cc:5:
-gen/include/vm_protos/proto_bindings/fuzzer.pb.h:38:10: fatal error: vm_crash.pb.h: No such file or directory
- 38 | #include "vm_crash.pb.h"
- | ^~~~~~~~~~~~~~~
-compilation terminated.
-ninja: build stopped: subcommand failed.
-
-Reported-by: Cole Helbling <cole.e.helbling@outlook.com>
-Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com>
----
- vm_tools/proto/BUILD.gn | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/vm_tools/proto/BUILD.gn b/vm_tools/proto/BUILD.gn
-index 713b81853..a25265cab 100644
---- a/vm_tools/proto/BUILD.gn
-+++ b/vm_tools/proto/BUILD.gn
-@@ -70,6 +70,7 @@ proto_library("fuzzer-protos") {
- deps = [
- ":container-rpcs",
- ":tremplin-rpcs",
-+ ":vm-crash-rpcs",
- ]
- sources = [
- "${proto_in_dir}/fuzzer.proto",
---
-2.26.2
-
diff --git a/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix b/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix
index 4f0aae3be38..e87d0c57e78 100644
--- a/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix
+++ b/pkgs/os-specific/linux/chromium-os/vm_protos/default.nix
@@ -12,8 +12,6 @@ common-mk {
"-Wno-error=deprecated-declarations"
];

- platform2Patches = [ ./0003-vm_tools-proto-fix-parallel-build.patch ];
-
postPatch = ''
substituteInPlace common-mk/proto_library.gni \
--replace /usr/bin/grpc_cpp_plugin ${grpc}/bin/grpc_cpp_plugin
--
2.31.1