gitlab: add back grpc patch
They downgraded grpc in the fix release (cherry picked from commit f007b794c758000a275b00dd0695d2fb155195f0)
This commit is contained in:
parent
d8e386b70d
commit
544ad3ea4b
@ -22,6 +22,12 @@ let
|
|||||||
gemset =
|
gemset =
|
||||||
let x = import (gemdir + "/gemset.nix");
|
let x = import (gemdir + "/gemset.nix");
|
||||||
in x // {
|
in x // {
|
||||||
|
# grpc expects the AR environment variable to contain `ar rpc`. See the
|
||||||
|
# discussion in nixpkgs #63056.
|
||||||
|
grpc = x.grpc // {
|
||||||
|
patches = [ ./fix-grpc-ar.patch ];
|
||||||
|
dontBuild = false;
|
||||||
|
};
|
||||||
# the openssl needs the openssl include files
|
# the openssl needs the openssl include files
|
||||||
openssl = x.openssl // {
|
openssl = x.openssl // {
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
|
@ -0,0 +1,10 @@
|
|||||||
|
--- a/src/ruby/ext/grpc/extconf.rb
|
||||||
|
+++ b/src/ruby/ext/grpc/extconf.rb
|
||||||
|
@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
|
||||||
|
if ENV['AR'].nil? || ENV['AR'].size == 0
|
||||||
|
ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs'
|
||||||
|
end
|
||||||
|
+ENV['AR'] = ENV['AR'] + ' rcs'
|
||||||
|
if ENV['CC'].nil? || ENV['CC'].size == 0
|
||||||
|
ENV['CC'] = RbConfig::CONFIG['CC']
|
||||||
|
end
|
@ -9,6 +9,16 @@ let
|
|||||||
inherit ruby;
|
inherit ruby;
|
||||||
copyGemFiles = true;
|
copyGemFiles = true;
|
||||||
gemdir = ./.;
|
gemdir = ./.;
|
||||||
|
gemset =
|
||||||
|
let x = import (gemdir + "/gemset.nix");
|
||||||
|
in x // {
|
||||||
|
# grpc expects the AR environment variable to contain `ar rpc`. See the
|
||||||
|
# discussion in nixpkgs #63056.
|
||||||
|
grpc = x.grpc // {
|
||||||
|
patches = [ ../fix-grpc-ar.patch ];
|
||||||
|
dontBuild = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
version = "14.2.3";
|
version = "14.2.3";
|
||||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user