diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
| commit | ff97b7dbe6aef98b105c8af34f19232aa7d49d80 (patch) | |
| tree | b44b52b9a17a84c84d179c1cafd3a3425c62751a /pkgs/servers | |
| parent | 0b82b9532229a28758df482218222d90d910c494 (diff) | |
| parent | b57bc220cc04e3d8f931b604e5acc44544b8c1c0 (diff) | |
| download | nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.gz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.bz2 nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.lz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.xz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.zst nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index b227832ad73..5b31207cb4e 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -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}" |