diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2019-05-12 16:26:43 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2019-05-12 16:31:13 +0200 |
| commit | e4d89879f89f142be4fc9b3184a29b2282e3b323 (patch) | |
| tree | 7d9f9d433b6c364cb1a096855d0c70f67c7acfe7 /pkgs | |
| parent | 2c86b2c79cbffb75b7ca724b6c259dfbf11a9e31 (diff) | |
| download | nixpkgs-e4d89879f89f142be4fc9b3184a29b2282e3b323.tar nixpkgs-e4d89879f89f142be4fc9b3184a29b2282e3b323.tar.gz nixpkgs-e4d89879f89f142be4fc9b3184a29b2282e3b323.tar.bz2 nixpkgs-e4d89879f89f142be4fc9b3184a29b2282e3b323.tar.lz nixpkgs-e4d89879f89f142be4fc9b3184a29b2282e3b323.tar.xz nixpkgs-e4d89879f89f142be4fc9b3184a29b2282e3b323.tar.zst nixpkgs-e4d89879f89f142be4fc9b3184a29b2282e3b323.zip | |
elasticsearch: add missing gnugrep and coreutils to wrapper
Diffstat (limited to 'pkgs')
| -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 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
4 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 0d67988e820..6142d751dab 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 73bee6c47f3..fffc84b2d28 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 a55a43baa0b..ddb1d2299cb 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}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b4fd137f81..f0143368b24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2656,14 +2656,22 @@ in elk6Version = "6.7.2"; elk7Version = "7.0.1"; - elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; - elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; + elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { + utillinux = utillinuxMinimal; + }; + elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { + utillinux = utillinuxMinimal; + }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { enableUnfree = false; + utillinux = utillinuxMinimal; + }; + elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { + utillinux = utillinuxMinimal; }; - elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; + utillinux = utillinuxMinimal; }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; |