protoc-gen-grpc-web: 1.3.0 -> 1.3.1
This commit is contained in:
parent
49186d631f
commit
676021d4a7
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "protoc-gen-grpc-web";
|
pname = "protoc-gen-grpc-web";
|
||||||
version = "1.3.0";
|
version = "1.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "grpc";
|
owner = "grpc";
|
||||||
repo = "grpc-web";
|
repo = "grpc-web";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw=";
|
sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = "source/javascript/net/grpc/web/generator";
|
sourceRoot = "source/javascript/net/grpc/web/generator";
|
||||||
|
@ -17,7 +17,12 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ protobuf ];
|
nativeBuildInputs = [ protobuf ];
|
||||||
buildInputs = [ protobuf ];
|
buildInputs = [ protobuf ];
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)" ];
|
makeFlags = [ "PREFIX=$(out)" "STATIC=no" ];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# https://github.com/grpc/grpc-web/pull/1210
|
||||||
|
./optional-static.patch
|
||||||
|
];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
checkInputs = [ protobuf ];
|
checkInputs = [ protobuf ];
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
--- 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
|
Loading…
Reference in a new issue