Skip to content

Fix elasticsearch8 hash mismatch and add cross-platform testing #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sciyoshi merged 1 commit into from
Aug 28, 2025
Merged

Fix elasticsearch8 hash mismatch and add cross-platform testing #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ You can use the packages from this flake in your configuration:
```nix
# In your outputs
outputs = { self, nixpkgs, nix-support }: {
devShells.x86_64-linux.default =
devShells.x86_64-linux.default =
let
pkgs = import nixpkgs { system = "x86_64-linux"; };
in
Expand Down
42 changes: 36 additions & 6 deletions pkgs/elasticsearch8.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
else "linux";
hashes = {
"x86_64-linux" = "sha512-au9PyE67/JjmZiQYxzTqicro5TqNbB+9U1KAe8Qn4EDmK+VotQKr3Ot6L1dTTq5g4xcS0Fg9N1L9Obe4o2MtOw==";
"aarch64-linux" = "sha512-au9PyE67/JjmZiQYxzTqicro5TqNbB+9U1KAe8Qn4EDmK+VotQKr3Ot6L1dTTq5g4xcS0Fg9N1L9Obe4o2MtOw==";
"aarch64-linux" = "sha512-Cxs+oOtrNy+4LN83YXGYmpMGi9xMP4DcJnB0g9CWBfa0DGUJbOzF4Vz87ZxvgjU/SmMutnesXXWbM4Pfk3bMRg==";
"x86_64-darwin" = "sha512-R7YbSehFAGJLwrSx6FNs6CArYUyo1JZc4VKZQJ5fbDVBpyhwFmtI6PWSVlLYyx2qnj9Yd/7YBTuhrj9sqQDYZQ==";
"aarch64-darwin" = "sha512-R7YbSehFAGJLwrSx6FNs6CArYUyo1JZc4VKZQJ5fbDVBpyhwFmtI6PWSVlLYyx2qnj9Yd/7YBTuhrj9sqQDYZQ==";
};
Expand All @@ -34,11 +34,11 @@ in
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';

nativeBuildInputs =
[
pkgs.makeBinaryWrapper
]
++ pkgs.lib.optional (!pkgs.stdenv.hostPlatform.isDarwin) pkgs.autoPatchelfHook;
nativeBuildInputs = [
pkgs.makeBinaryWrapper
] ++ pkgs.lib.optionals (!pkgs.stdenv.hostPlatform.isDarwin) [
pkgs.patchelf
];

buildInputs = [
pkgs.jre_headless
Expand Down Expand Up @@ -66,6 +66,36 @@ in
wrapProgram $out/bin/elasticsearch-plugin --set ES_JAVA_HOME "${pkgs.jre_headless}"
'';

postInstall = pkgs.lib.optionalString (!pkgs.stdenv.hostPlatform.isDarwin) ''
# Manually patch ELF binaries on Linux to fix dynamic library paths
find $out -type f -executable | while read -r file; do
if file "$file" | grep -q "ELF.*executable" && [ ! -L "$file" ]; then
echo "Patching ELF executable: $file"
# Use patchelf to set the interpreter and fix rpath, but be more conservative
if ${pkgs.patchelf}/bin/patchelf --print-interpreter "$file" 2>/dev/null; then
${pkgs.patchelf}/bin/patchelf \
--set-interpreter "$(cat ${pkgs.stdenv.cc}/nix-support/dynamic-linker)" \
"$file" 2>/dev/null || echo "Failed to set interpreter for $file"
fi
if ${pkgs.patchelf}/bin/patchelf --print-rpath "$file" 2>/dev/null; then
${pkgs.patchelf}/bin/patchelf \
--set-rpath "${pkgs.lib.makeLibraryPath [ pkgs.zlib pkgs.stdenv.cc.cc.lib ]}" \
"$file" 2>/dev/null || echo "Failed to set rpath for $file"
fi
fi
done

# Also patch any shared libraries, but be selective
find $out -name "*.so*" -type f | while read -r file; do
if file "$file" | grep -q "ELF.*shared object" && [ ! -L "$file" ]; then
echo "Patching shared library: $file"
${pkgs.patchelf}/bin/patchelf \
--set-rpath "${pkgs.lib.makeLibraryPath [ pkgs.zlib pkgs.stdenv.cc.cc.lib ]}" \
"$file" 2>/dev/null || echo "Failed to patch shared library $file"
fi
done
'';

passthru = {
enableUnfree = true;
};
Expand Down
Loading