From 0cffa85d571ffa8d36acb5b643e2ecb6a039e5e9 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Thu, 5 Dec 2019 10:39:52 +0100
Subject: [PATCH] bazel: remove wrapProgram and move it to system configuration

This way, custom configurations are all at the same place. Also, user
may override these settings using the command line.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 7a5ca2f90d2a..6d8eb56bdf33 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -132,6 +132,7 @@ let
     text = ''
       build --override_repository=${remote_java_tools.name}=${remote_java_tools}
       build --distdir=${distDir}
+      startup --server_javabase=${runJdk}
     '';
   };
 
@@ -484,8 +485,6 @@ stdenv.mkDerivation rec {
     cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
     mv ./bazel_src/output/bazel $out/bin/bazel-real
 
-    wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
-
     # shell completion files
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
     mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel