protoc-gen-grpc-web: 1.3.1 -> 1.4.2

Diff: https://github.com/grpc/grpc-web/compare/1.3.1...1.4.2

Changelog: https://github.com/grpc/grpc-web/blob/1.4.2/CHANGELOG.md

1 files changed, 18 insertions, 14 deletions

diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
index 0b7eca7e1de..15d2e9ec0ca 100644
--- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix
+++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
@@ -1,27 +1,31 @@
-{ lib, stdenv, fetchFromGitHub, protobuf }:
-
-stdenv.mkDerivation rec {
+{ lib
+, stdenv
+, fetchFromGitHub
+, protobuf
+, isStatic ? stdenv.hostPlatform.isStatic
+}:
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "protoc-gen-grpc-web";
-  version = "1.3.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc-web";
-    rev = version;
-    sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc=";
+    rev = finalAttrs.version;
+    sha256 = "sha256-OetDAZ6zC8r7e82FILpQQnM+JHG9eludwhEuPaklrnw=";
   };
 
   sourceRoot = "source/javascript/net/grpc/web/generator";
 
+  enableParallelBuilding = true;
   strictDeps = true;
   nativeBuildInputs = [ protobuf ];
   buildInputs = [ protobuf ];
 
-  makeFlags = [ "PREFIX=$(out)" "STATIC=no" ];
-
-  patches = [
-    # https://github.com/grpc/grpc-web/pull/1210
-    ./optional-static.patch
+  makeFlags = [
+    "PREFIX=$(out)"
+    "STATIC=${if isStatic then "yes" else "no"}"
   ];
 
   doCheck = true;
@@ -33,7 +37,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$CHECK_TMPDIR"
 
     protoc \
-      --proto_path="${src}/packages/grpc-web/test/protos" \
+      --proto_path="$src/packages/grpc-web/test/protos" \
       --plugin="./protoc-gen-grpc-web" \
       --grpc-web_out="import_style=commonjs,mode=grpcwebtext:$CHECK_TMPDIR" \
       echo.proto
@@ -46,10 +50,10 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/grpc/grpc-web";
-    changelog = "https://github.com/grpc/grpc-web/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/grpc/grpc-web/blob/${finalAttrs.version}/CHANGELOG.md";
     description = "gRPC web support for Google's protocol buffers";
     license = licenses.asl20;
     maintainers = with maintainers; [ jk ];
     platforms = platforms.unix;
   };
-}
+})