diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-03-04 22:16:45 +0100 |
| commit | 6d1958ad2dda67aa4f667d2283781949c8d18303 (patch) | |
| tree | 56cb000fe8a66aaa690a61dae410a86bebde2b56 /pkgs/servers/search | |
| parent | 9f7ce23482602164afe4f0a339f20879bf7df6cc (diff) | |
| parent | a992d6867108fa317f461becc92a7f36a59bac61 (diff) | |
| download | nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.gz nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.bz2 nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.lz nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.xz nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.tar.zst nixpkgs-6d1958ad2dda67aa4f667d2283781949c8d18303.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/servers/search')
| -rw-r--r-- | pkgs/servers/search/elasticsearch/6.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/search/elasticsearch/7.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/search/solr/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix index b3ad305687a..3558fd5935e 100644 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index ffe8a75412b..f808b6985b4 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (rec { }; } // optionalAttrs enableUnfree { dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; runtimeDependencies = [ zlib ]; postFixup = '' for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 2b22c38143c..479a7616ae1 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Open source enterprise search platform from the Apache Lucene project"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ domenkozar aanderse ]; + maintainers = with maintainers; [ aanderse ]; }; } |