Skip to content
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.

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

Jump to bottom

[18.09] elasticsearch: Add zlib to buildInputs for unfree #56127

Merged
merged 1 commit into from Feb 21, 2019
Merged

[18.09] elasticsearch: Add zlib to buildInputs for unfree #56127

merged 1 commit into from Feb 21, 2019

Conversation

thefloweringash
Copy link
Member

Motivation for this change

Elasticsearch fails to build: #56055

On master, autopatchElf was improved (#47222) but with minor incompatibilities which were fixed on master. However autopatchElf was backported (#55538) without one of the fixes. This is the simple git cherry-pick -x backport.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@aszlig @thefloweringash
elasticsearch: Add zlib to buildInputs for unfree
b36e287 
The unfree variant of elasticsearch uses autoPatchelfHook and since we
removed the dependency on file for the hook itself in
58a97df we no longer have zlib
propagated.

So we need to explicitly state that dependency here.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @apeschar, @basvandijk
(cherry picked from commit 8df68a9)
@worldofpeace worldofpeace merged commit 3276e04 into NixOS:release-18.09 Feb 21, 2019
@worldofpeace
Copy link
Contributor

Thanks @thefloweringash 👍

@thefloweringash thefloweringash deleted the fix-es6 branch May 1, 2019 16:36
@totoroot totoroot mentioned this pull request Dec 4, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thefloweringash @worldofpeace @GrahamcOfBorg @aszlig