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

Merge remote-tracking branch 'origin/master' into staging

Browse Source
This commit is contained in:
Eelco Dolstra
2014-07-14 17:04:55 +02:00
parent 0b82b95322 b57bc220cc
commit ff97b7dbe6
1429 changed files with 4283 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/servers/search/elasticsearch/default.nix
View File

@@ -1,4 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre, utillinux }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "elasticsearch-1.2.1";
@@ -9,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./es-home.patch ];
buildInputs = [ makeWrapper jre utillinux ];
buildInputs = [ makeWrapper jre ] ++ optional (!stdenv.isDarwin) utillinux;
installPhase = ''
mkdir -p $out
@@ -21,7 +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/*" \
--prefix PATH : "${utillinux}/bin/" \
${optionalString (!stdenv.isDarwin) ''--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/*" --set JAVA_HOME "${jre}"