ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
06kellyjac 2023-03-16 15:25:51 +00:00
parent d50740cd2c
commit 2ab1999df5
2 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/tools/protoc-gen-grpc-web/default.nix
View File

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

19
pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch
View File

@ -1,19 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11
LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl
PREFIX ?= /usr/local
MIN_MACOS_VERSION := 10.7 # Supports OS X Lion
+STATIC ?= yes
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION)
else ifeq ($(UNAME_S),Linux)
- LDFLAGS += -static
+ ifeq ($(STATIC),yes)
+ LDFLAGS += -static
+ endif
endif
all: protoc-gen-grpc-web