gitaly: fix x86_64-darwin build
This commit is contained in:
parent
8e09025284
commit
3f8e12cc87
|
@ -72,7 +72,7 @@ buildGoModule {
|
|||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/gitlab-org/gitaly";
|
||||
description = "A Git RPC service for handling all the git calls made by GitLab";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ [ "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ roblabla globin fpletz talyz ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
|
||||
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
|
||||
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
|
||||
, CoreServices, DarwinTools, cctools
|
||||
, CoreServices, DarwinTools, cctools, libtool
|
||||
}@args:
|
||||
|
||||
let
|
||||
|
@ -280,7 +280,7 @@ in
|
|||
};
|
||||
|
||||
grpc = attrs: {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin libtool;
|
||||
buildInputs = [ openssl ];
|
||||
hardeningDisable = [ "format" ];
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
|
@ -297,6 +297,9 @@ in
|
|||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '-Wno-invalid-source-encoding' ""
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/ruby/ext/grpc/extconf.rb \
|
||||
--replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -570,7 +573,7 @@ in
|
|||
};
|
||||
|
||||
rugged = attrs: {
|
||||
nativeBuildInputs = [ cmake pkg-config which ];
|
||||
nativeBuildInputs = [ cmake pkg-config which ] ++ lib.optional stdenv.isDarwin libiconv;
|
||||
buildInputs = [ openssl libssh2 zlib ];
|
||||
dontUseCmakeConfigure = true;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue