diff options
| author | numkem <numkem@numkem.org> | 2018-06-15 15:35:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 15:35:23 -0400 |
| commit | cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d (patch) | |
| tree | ad1269cffa620ce756c0533e438ac86febdf4add /pkgs/servers/search/elasticsearch/default.nix | |
| parent | 47aa1da7a020e96764ef522c2d63398aa0332798 (diff) | |
| parent | 54ea1cd58aefde76f7ab2f63e955b9c622c70d1f (diff) | |
| download | nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.gz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.bz2 nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.lz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.xz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.zst nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.zip | |
Merge pull request #1 from NixOS/master
Sync with upstream
Diffstat (limited to 'pkgs/servers/search/elasticsearch/default.nix')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 859f1501bb3c..f4780603f502 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux }: with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.5.2"; + name = "elasticsearch-1.7.2"; src = fetchurl { url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "054s0k0y0g1x6wzbd6gmvrp5n89fqwqssbyhay0gmhvs6sbpibpg"; + sha256 = "1lix4asvx1lbc227gzsrws3xqbcbqaal7v10w60kch0c4xg970bg"; }; patches = [ ./es-home.patch ]; - buildInputs = [ makeWrapper jre ] ++ - (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + buildInputs = [ makeWrapper jre utillinux ]; installPhase = '' mkdir -p $out @@ -25,9 +24,7 @@ stdenv.mkDerivation rec { # set ES_CLASSPATH and JAVA_HOME wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - ${if (!stdenv.isDarwin) - then ''--prefix PATH : "${utillinux}/bin/"'' - else ''--prefix PATH : "${getopt}/bin"''} \ + --prefix PATH : "${utillinux}/bin" \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ |