Skip to content

ENH Fix musl64 bzip2 #2176

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
merged 5 commits into from
Jul 13, 2024
Merged

ENH Fix musl64 bzip2 #2176

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e6d22a
ENH Fix musl64 bzip2
luispedro Feb 26, 2024
680d376
Merge remote-tracking branch 'origin/master' into revert_bzip2_musl
hamishmack Apr 5, 2024
8ba9d87
Fix for nixpkgs 23.05 and set enableStatic for 23.11
hamishmack Apr 5, 2024
cd21eaf
Refactor and add comment about enableStatic
hamishmack Apr 5, 2024
a538ce3
Merge remote-tracking branch 'origin/master' into revert_bzip2_musl
hamishmack Jul 12, 2024
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
3 changes: 2 additions & 1 deletion overlays/musl.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
zlib = prev.zlib.override { splitStaticOutput = false; };

# and a few more packages that need their static libs explicitly enabled
bzip2 = prev.bzip2.override { enableStatic = true; };
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now it's in both?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well // would have replaced bzip2, but I have refactored it to make it clearer and added a comment.

gmp = prev.gmp.override { withStatic = true; };
ncurses = prev.ncurses.override { enableStatic = true; };
libsodium = prev.libsodium.overrideAttrs (_: { dontDisableStatic = true; });
Expand Down Expand Up @@ -39,7 +40,7 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
} // prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.lib.trivial.release "20.03") {
# Fix infinite recursion between openssh and fetchcvs
openssh = prev.openssh.override { withFIDO = false; };
} // prev.lib.optionalAttrs (prev.lib.versionOlder prev.lib.trivial.release "23.05") {
} // prev.lib.optionalAttrs (prev.lib.versionOlder prev.lib.trivial.release "23.11") {
# This option was renamed to enableStatic, to be more consistent with packages with a similar
# static toggles. However, it now correctly defaults to true when `hostPlatform.isStatic` is true.
bzip2 = prev.bzip2.override { linkStatic = true; };
Expand Down