pkgsMusl: omit obsolete bzip2 override on newer NixOS releases (#2117)

input-output-hk · Nov 30, 2023 · 40660aa · 40660aa
1 parent 35dcaaa
commit 40660aa
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/overlays/musl.nix b/overlays/musl.nix
@@ -9,7 +9,6 @@ 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 { linkStatic = true; };
   gmp = prev.gmp.override { withStatic = true; };
   ncurses = prev.ncurses.override { enableStatic = true; };
   libsodium = prev.libsodium.overrideAttrs (_: { dontDisableStatic = true; });
@@ -40,4 +39,8 @@ 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") {
+  # 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; };
 })