MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 16:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #61375 from xtruder/pkgs/elasticsearch/missing_deps

Browse source 
elasticsearch: add missing gnugrep and coreutils to wrapper
This commit is contained in:
Jaka Hudoklin 2019-05-13 10:44:24 +02:00 committed by GitHub
commit 310989baef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/servers/search/elasticsearch/5.x.nix
View file

@ -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"

4
pkgs/servers/search/elasticsearch/6.x.nix
View file

@ -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}"

4
pkgs/servers/search/elasticsearch/7.x.nix
View file

@ -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}"

14
pkgs/top-level/all-packages.nix
View file

@ -2658,14 +2658,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;