summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Ivankov <divanorama@gmail.com>2022-11-28 21:55:47 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2022-11-29 19:13:49 +0100
commitb74083b00f03ce7698b6492cb3a65f2fd133082d (patch)
treebde5f00c73046656f1408309b5d2cd7de035e6dd
parentMerge pull request #203631 from NixOS/backport-197986-to-release-22.11 (diff)
downloadnixpkgs-b74083b00f03ce7698b6492cb3a65f2fd133082d.tar.gz
elasticsearch6: add libcrypt dependency to fix build
glibc's libcrypt is deprecated and since ff30c899d8bd92d1a1c9f4d4e81455b04cb0868e is built by default without libcrypt, that's probably the point when `elasticsearch6` started failing with ``` auto-patchelf: 3 dependencies could not be satisfied error: auto-patchelf could not satisfy dependency libcrypt.so.1 wanted by /nix/store/nd0gn95yfnnmnnw8zk2jnafc9gj2qy91-elasticsearch-6.8.21/modules/x-pack-ml/platform/linux-x86_64/lib/liblog4cxx.so.10 error: auto-patchelf could not satisfy dependency libcrypt.so.1 wanted by /nix/store/nd0gn95yfnnmnnw8zk2jnafc9gj2qy91-elasticsearch-6.8.21/modules/x-pack-ml/platform/linux-x86_64/lib/libaprutil-1.so.0 error: auto-patchelf could not satisfy dependency libcrypt.so.1 wanted by /nix/store/nd0gn95yfnnmnnw8zk2jnafc9gj2qy91-elasticsearch-6.8.21/modules/x-pack-ml/platform/linux-x86_64/lib/libapr-1.so.0 ``` Let's add libxcrypt dependency, also note that `elasticsearch6-oss` doesn't seem to need it. Should resolve https://github.com/NixOS/nixpkgs/issues/203467 Extra note is elk6 may get removed from nixpkgs soon in favor of elk7 https://github.com/NixOS/nixpkgs/pull/194420 (cherry picked from commit 18271606a27dbd337515e74387e994f6079c3462)
-rw-r--r--pkgs/servers/search/elasticsearch/6.x.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix
index 32f6d67925c5..f14138ca0897 100644
--- a/pkgs/servers/search/elasticsearch/6.x.nix
+++ b/pkgs/servers/search/elasticsearch/6.x.nix
@@ -5,6 +5,7 @@
, makeWrapper
, jre_headless
, util-linux, gnugrep, coreutils
+, libxcrypt
, autoPatchelfHook
, zlib
}:
@@ -37,7 +38,7 @@ stdenv.mkDerivation (rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre_headless util-linux ]
- ++ optional enableUnfree zlib;
+ ++ optional enableUnfree [ zlib libxcrypt ];
installPhase = ''
mkdir -p $out