cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #149901 from Kloenk/gitaly_x86-darwin

Browse source 
gitaly: fix x86_64-darwin build
This commit is contained in:
Jörg Thalheim 2021-12-09 19:54:11 +00:00 committed by GitHub
commit a0c37f0667
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -72,7 +72,7 @@ buildGoModule {
meta = with lib; { meta = with lib; {
homepage = "https://gitlab.com/gitlab-org/gitaly"; homepage = "https://gitlab.com/gitlab-org/gitaly";
description = "A Git RPC service for handling all the git calls made by GitLab"; 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 ]; maintainers = with maintainers; [ roblabla globin fpletz talyz ];
license = licenses.mit; license = licenses.mit;
}; };

9
pkgs/development/ruby-modules/gem-config/default.nix
View file

@ -26,7 +26,7 @@
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
, CoreServices, DarwinTools, cctools , CoreServices, DarwinTools, cctools, libtool
}@args: }@args:
let let
@ -280,7 +280,7 @@ in
}; };
grpc = attrs: { grpc = attrs: {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin libtool;
buildInputs = [ openssl ]; buildInputs = [ openssl ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = toString [ NIX_CFLAGS_COMPILE = toString [
@ -297,6 +297,9 @@ in
postPatch = '' postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace '-Wno-invalid-source-encoding' "" --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: { rugged = attrs: {
nativeBuildInputs = [ cmake pkg-config which ]; nativeBuildInputs = [ cmake pkg-config which ] ++ lib.optional stdenv.isDarwin libiconv;
buildInputs = [ openssl libssh2 zlib ]; buildInputs = [ openssl libssh2 zlib ];
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
}; };