diff options
| author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2019-05-13 10:44:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-13 10:44:24 +0200 |
| commit | 310989baefae064831ee98a02463576e7bf84309 (patch) | |
| tree | 03137649cf625aeb28ae4ff4ee5839a340b7e335 /pkgs/servers | |
| parent | b5f26f3803b169437b9b458fbcdd18b365ef6bcc (diff) | |
| parent | e4d89879f89f142be4fc9b3184a29b2282e3b323 (diff) | |
| download | nixlib-310989baefae064831ee98a02463576e7bf84309.tar nixlib-310989baefae064831ee98a02463576e7bf84309.tar.gz nixlib-310989baefae064831ee98a02463576e7bf84309.tar.bz2 nixlib-310989baefae064831ee98a02463576e7bf84309.tar.lz nixlib-310989baefae064831ee98a02463576e7bf84309.tar.xz nixlib-310989baefae064831ee98a02463576e7bf84309.tar.zst nixlib-310989baefae064831ee98a02463576e7bf84309.zip | |
Merge pull request #61375 from xtruder/pkgs/elasticsearch/missing_deps
elasticsearch: add missing gnugrep and coreutils to wrapper
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/5.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/search/elasticsearch/6.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/search/elasticsearch/7.x.nix | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 0d67988e8208..6142d751dab1 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless, utillinux }: +{ stdenv, fetchurl, elk5Version, makeWrapper, jre_headless +, utillinux, gnugrep, coreutils }: with stdenv.lib; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/*" \ - --prefix PATH : "${utillinux}/bin" \ + --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \ --set JAVA_HOME "${jre_headless}" \ --set ES_JVM_OPTIONS "$out/config/jvm.options" diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index 73bee6c47f3c..fffc84b2d281 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -4,7 +4,7 @@ , fetchurl , makeWrapper , jre_headless -, utillinux +, utillinux, gnugrep, coreutils , autoPatchelfHook , zlib }: @@ -45,7 +45,7 @@ stdenv.mkDerivation (rec { chmod -x $out/bin/*.* wrapProgram $out/bin/elasticsearch \ - --prefix PATH : "${utillinux}/bin/" \ + --prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \ --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index a55a43baa0be..ddb1d2299cbb 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -4,7 +4,7 @@ , fetchurl , makeWrapper , jre_headless -, utillinux +, utillinux, gnugrep, coreutils , autoPatchelfHook , zlib }: @@ -56,7 +56,7 @@ stdenv.mkDerivation (rec { chmod +x $out/bin/* wrapProgram $out/bin/elasticsearch \ - --prefix PATH : "${utillinux}/bin/" \ + --prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \ --set JAVA_HOME "${jre_headless}" wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" |