Skip to content

Commit 8ba9d87

Browse files
committed
Fix for nixpkgs 23.05 and set enableStatic for 23.11
1 parent 680d376 commit 8ba9d87

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

overlays/musl.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +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; };
12+
bzip2 = prev.bzip2.override { enableStatic = true; };
1313
gmp = prev.gmp.override { withStatic = true; };
1414
ncurses = prev.ncurses.override { enableStatic = true; };
1515
libsodium = prev.libsodium.overrideAttrs (_: { dontDisableStatic = true; });
@@ -40,4 +40,8 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
4040
} // prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.lib.trivial.release "20.03") {
4141
# Fix infinite recursion between openssh and fetchcvs
4242
openssh = prev.openssh.override { withFIDO = false; };
43+
} // prev.lib.optionalAttrs (prev.lib.versionOlder prev.lib.trivial.release "23.11") {
44+
# This option was renamed to enableStatic, to be more consistent with packages with a similar
45+
# static toggles. However, it now correctly defaults to true when `hostPlatform.isStatic` is true.
46+
bzip2 = prev.bzip2.override { linkStatic = true; };
4347
})

0 commit comments

Comments
 (0)