pyrox.dev
Merge #161852: protoc-gen-grpc-web: 1.3.0 -> 1.3.1
+8
-3
pkgs/development/tools/protoc-gen-grpc-web/default.nix
+8
-3
pkgs/development/tools/protoc-gen-grpc-web/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "protoc-gen-grpc-web";
5
-
version = "1.3.0";
5
+
version = "1.3.1";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "grpc";
9
9
repo = "grpc-web";
10
10
rev = version;
11
-
sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw=";
11
+
sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc=";
12
12
};
13
13
14
14
sourceRoot = "source/javascript/net/grpc/web/generator";
···
17
17
nativeBuildInputs = [ protobuf ];
18
18
buildInputs = [ protobuf ];
19
19
20
-
makeFlags = [ "PREFIX=$(out)" ];
20
+
makeFlags = [ "PREFIX=$(out)" "STATIC=no" ];
21
+
22
+
patches = [
23
+
# https://github.com/grpc/grpc-web/pull/1210
24
+
./optional-static.patch
25
+
];
21
26
22
27
doCheck = true;
23
28
checkInputs = [ protobuf ];
+19
pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch
+19
pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch
···
1
+
--- a/Makefile
2
+
+++ b/Makefile
3
+
@@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11
4
+
LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl
5
+
PREFIX ?= /usr/local
6
+
MIN_MACOS_VERSION := 10.7 # Supports OS X Lion
7
+
+STATIC ?= yes
8
+
9
+
UNAME_S := $(shell uname -s)
10
+
ifeq ($(UNAME_S),Darwin)
11
+
CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION)
12
+
else ifeq ($(UNAME_S),Linux)
13
+
- LDFLAGS += -static
14
+
+ ifeq ($(STATIC),yes)
15
+
+ LDFLAGS += -static
16
+
+ endif
17
+
endif
18
+
19
+
all: protoc-gen-grpc-web