diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-08-16 12:53:12 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-08-16 12:55:23 +0200 |
| commit | 953643bb0f77b629f751c391aaf8d5c7a6aea221 (patch) | |
| tree | dd589e6a4dad0eb892379e754d07920a6ba34bca /pkgs/servers | |
| parent | 68c7662e983447f29e5af51cc793131217bd3881 (diff) | |
| download | nixpkgs-953643bb0f77b629f751c391aaf8d5c7a6aea221.tar nixpkgs-953643bb0f77b629f751c391aaf8d5c7a6aea221.tar.gz nixpkgs-953643bb0f77b629f751c391aaf8d5c7a6aea221.tar.bz2 nixpkgs-953643bb0f77b629f751c391aaf8d5c7a6aea221.tar.lz nixpkgs-953643bb0f77b629f751c391aaf8d5c7a6aea221.tar.xz nixpkgs-953643bb0f77b629f751c391aaf8d5c7a6aea221.tar.zst nixpkgs-953643bb0f77b629f751c391aaf8d5c7a6aea221.zip | |
elasticsearch: fix darwin, needs getopt
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 569ec87c4cb..967eae40bb1 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux }: +{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }: with stdenv.lib; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./es-home.patch ]; - buildInputs = [ makeWrapper jre ] ++ optional (!stdenv.isDarwin) utillinux; + buildInputs = [ makeWrapper jre ] ++ + (if (!stdenv.isDarwin) then [utillinux] else [getopt]); installPhase = '' mkdir -p $out @@ -24,10 +25,13 @@ 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/*" \ - ${optionalString (!stdenv.isDarwin) ''--prefix PATH : "${utillinux}/bin/"''} \ + ${if (!stdenv.isDarwin) + then ''--prefix PATH : "${utillinux}/bin/"'' + else ''--prefix PATH : "${getopt}/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}" + --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ + --set JAVA_HOME "${jre}" ''; meta = { |