diff options
| author | 06kellyjac <dev@j-k.io> | 2022-02-25 15:25:12 +0000 |
|---|---|---|
| committer | 06kellyjac <dev@j-k.io> | 2022-02-25 15:25:12 +0000 |
| commit | 676021d4a742aad8745a9b5b7f37eb363a6cb49a (patch) | |
| tree | 441d24f897f374e78eac21da62b756f7f284de22 | |
| parent | 49186d631fb860859a05fa59b2ed7d38c9ad286c (diff) | |
| download | nixpkgs-676021d4a742aad8745a9b5b7f37eb363a6cb49a.tar nixpkgs-676021d4a742aad8745a9b5b7f37eb363a6cb49a.tar.gz nixpkgs-676021d4a742aad8745a9b5b7f37eb363a6cb49a.tar.bz2 nixpkgs-676021d4a742aad8745a9b5b7f37eb363a6cb49a.tar.lz nixpkgs-676021d4a742aad8745a9b5b7f37eb363a6cb49a.tar.xz nixpkgs-676021d4a742aad8745a9b5b7f37eb363a6cb49a.tar.zst nixpkgs-676021d4a742aad8745a9b5b7f37eb363a6cb49a.zip | |
protoc-gen-grpc-web: 1.3.0 -> 1.3.1
| -rw-r--r-- | pkgs/development/tools/protoc-gen-grpc-web/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch | 19 |
2 files changed, 27 insertions, 3 deletions
diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index acbd23ec292..279f8101f78 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -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 ]; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch b/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch new file mode 100644 index 00000000000..a7ca112749c --- /dev/null +++ b/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch @@ -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 |