public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elasticsearch5: Set classpath for elasticsearch-plugin

Browse Source
This commit is contained in:
Andrew Childs 2018-06-28 19:09:39 +09:00
parent 7261a66d71
commit a93c1c2ace
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/search/elasticsearch/5.x.nix
View File

@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
--set JAVA_HOME "${jre_headless}" \ --set JAVA_HOME "${jre_headless}" \
--set ES_JVM_OPTIONS "$out/config/jvm.options" --set ES_JVM_OPTIONS "$out/config/jvm.options"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin \
--prefix ES_CLASSPATH : "$out/lib/*" \
--set JAVA_HOME "${jre_headless}"
''; '';
meta = { meta = {

9
pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
View File

@ -32,3 +32,12 @@ diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
-fi -fi
- -
-ES_CLASSPATH="$ES_HOME/lib/*" -ES_CLASSPATH="$ES_HOME/lib/*"
diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
--- a/bin/elasticsearch-plugin 2018-04-13 01:21:55.000000000 +0900
+++ b/bin/elasticsearch-plugin 2018-06-28 19:08:54.700969245 +0900
@@ -88,4 +88,4 @@ if [ -e "$CONF_DIR" ]; then
path_props=("${path_props[@]}" -Des.path.conf="$CONF_DIR")
fi
-exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginCli "${args[@]}"
+exec "$JAVA" $ES_JAVA_OPTS -Delasticsearch "${path_props[@]}" -cp "$ES_CLASSPATH" org.elasticsearch.plugins.PluginCli "${args[@]}"