From 363b352af3cba175c55d47d94e86e9e289da7396 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 9 Jul 2019 20:09:15 -0400 Subject: gitlab: 11.10.8 -> 12.0.3 This is a major version bump but things were generally straightforward save two wrinkles: * it is necessary to ignore collisions in the gitlab bundler environment as both `omniauth_oauth2_generic` and `apollo_upload_server` provide a `console` executable. * grpc had to be patched since its build system expects the `AR` environment variable to contain not just the path to `ar` but also the `rpc` flags (see the discussion in nixpkgs #63056). --- pkgs/applications/version-management/gitlab/fix-grpc-ar.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 pkgs/applications/version-management/gitlab/fix-grpc-ar.patch (limited to 'pkgs/applications/version-management/gitlab/fix-grpc-ar.patch') diff --git a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch new file mode 100644 index 00000000000..9b95e668e04 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch @@ -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 -- cgit 1.4.1