diff options
author | Ben Gamari <ben@smart-cactus.org> | 2019-07-09 20:09:15 -0400 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2019-07-14 23:03:39 +0200 |
commit | 363b352af3cba175c55d47d94e86e9e289da7396 (patch) | |
tree | f70b9d63e839405be5444ab12bafe3b36642ed40 /pkgs/applications/version-management/gitlab/fix-grpc-ar.patch | |
parent | acb11340749109b49757f7a6b58ff8fa75e03ca3 (diff) | |
download | nixpkgs-363b352af3cba175c55d47d94e86e9e289da7396.tar nixpkgs-363b352af3cba175c55d47d94e86e9e289da7396.tar.gz nixpkgs-363b352af3cba175c55d47d94e86e9e289da7396.tar.bz2 nixpkgs-363b352af3cba175c55d47d94e86e9e289da7396.tar.lz nixpkgs-363b352af3cba175c55d47d94e86e9e289da7396.tar.xz nixpkgs-363b352af3cba175c55d47d94e86e9e289da7396.tar.zst nixpkgs-363b352af3cba175c55d47d94e86e9e289da7396.zip |
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).
Diffstat (limited to 'pkgs/applications/version-management/gitlab/fix-grpc-ar.patch')
-rw-r--r-- | pkgs/applications/version-management/gitlab/fix-grpc-ar.patch | 10 |
1 files changed, 10 insertions, 0 deletions
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 |