ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-05 09:58:50 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
06kellyjac 2022-02-25 15:25:12 +00:00
parent 49186d631f
commit 676021d4a7
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "protoc-gen-grpc-web";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc-web";
rev = version;
sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw=";
sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc=";
};
sourceRoot = "source/javascript/net/grpc/web/generator";
@ -17,7 +17,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ 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;
checkInputs = [ protobuf ];

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

@ -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