Skip to content

Commit 6e6d22a

Browse files
committed
ENH Fix musl64 bzip2
1 parent 11337f2 commit 6e6d22a

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

overlays/musl.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
99
zlib = prev.zlib.override { splitStaticOutput = false; };
1010

1111
# and a few more packages that need their static libs explicitly enabled
12+
bzip2 = prev.bzip2.override { linkStatic = true; };
1213
gmp = prev.gmp.override { withStatic = true; };
1314
ncurses = prev.ncurses.override { enableStatic = true; };
1415
libsodium = prev.libsodium.overrideAttrs (_: { dontDisableStatic = true; });
@@ -39,8 +40,4 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
3940
} // prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.lib.trivial.release "20.03") {
4041
# Fix infinite recursion between openssh and fetchcvs
4142
openssh = prev.openssh.override { withFIDO = false; };
42-
} // prev.lib.optionalAttrs (prev.lib.versionOlder prev.lib.trivial.release "23.05") {
43-
# This option was renamed to enableStatic, to be more consistent with packages with a similar
44-
# static toggles. However, it now correctly defaults to true when `hostPlatform.isStatic` is true.
45-
bzip2 = prev.bzip2.override { linkStatic = true; };
4643
})

0 commit comments

Comments
 (0)