pyrox.dev
gitlab: add back grpc patch
They downgraded grpc in the fix release
+6
pkgs/applications/version-management/gitlab/default.nix
+6
pkgs/applications/version-management/gitlab/default.nix
···
22
22
gemset =
23
23
let x = import (gemdir + "/gemset.nix");
24
24
in x // {
25
+
# grpc expects the AR environment variable to contain `ar rpc`. See the
26
+
# discussion in nixpkgs #63056.
27
+
grpc = x.grpc // {
28
+
patches = [ ./fix-grpc-ar.patch ];
29
+
dontBuild = false;
30
+
};
25
31
# the openssl needs the openssl include files
26
32
openssl = x.openssl // {
27
33
buildInputs = [ openssl ];
+10
pkgs/applications/version-management/gitlab/fix-grpc-ar.patch
+10
pkgs/applications/version-management/gitlab/fix-grpc-ar.patch
···
1
+
--- a/src/ruby/ext/grpc/extconf.rb
2
+
+++ b/src/ruby/ext/grpc/extconf.rb
3
+
@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7'
4
+
if ENV['AR'].nil? || ENV['AR'].size == 0
5
+
ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs'
6
+
end
7
+
+ENV['AR'] = ENV['AR'] + ' rcs'
8
+
if ENV['CC'].nil? || ENV['CC'].size == 0
9
+
ENV['CC'] = RbConfig::CONFIG['CC']
10
+
end
+10
pkgs/applications/version-management/gitlab/gitaly/default.nix
+10
pkgs/applications/version-management/gitlab/gitaly/default.nix
···
9
9
inherit ruby;
10
10
copyGemFiles = true;
11
11
gemdir = ./.;
12
+
gemset =
13
+
let x = import (gemdir + "/gemset.nix");
14
+
in x // {
15
+
# grpc expects the AR environment variable to contain `ar rpc`. See the
16
+
# discussion in nixpkgs #63056.
17
+
grpc = x.grpc // {
18
+
patches = [ ../fix-grpc-ar.patch ];
19
+
dontBuild = false;
20
+
};
21
+
};
12
22
};
13
23
version = "14.2.3";
14
24
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";