Cleanup

Author: angerman

overlays/hackage-quirks.nix

@@ -44,12 +44,6 @@ in { haskell-nix = prev.haskell-nix // {
             sha256 = "0jcpja4s4cylmg9rddyakb1p1fb4l41ffwmy0njpb1dxc5z3v618";
           };
         })
-        # Musl needs static zlib
-        (lib.optionalAttrs final.stdenv.hostPlatform.isMusl {
-          packages.pandoc.components.exes.pandoc.configureFlags = [
-            "--ghc-option=-optl=-L${final.zlib.static}/lib"
-          ];
-        })
       ];
     };
 

test/fully-static/default.nix

@@ -17,32 +17,11 @@ let
     src = testSrc "fully-static";
     pkg-def-extras = [];
     modules = [
-      # Musl libc fully static build
-      (let
-        staticLibs = [
-          zlib.static
-          (openssl.override { static = true; }).out
-          (libffi.overrideAttrs (oldAttrs: {
-            dontDisableStatic = true;
-            configureFlags = (oldAttrs.configureFlags or []) ++ [
-              "--enable-static"
-              "--disable-shared"
-            ];
-          }))
-        ] ++ optional gpl (gmp6.override { withStatic = true; });
-
-        withFullyStatic = {
-          configureFlags =
-             optionals stdenv.hostPlatform.isMusl (map (drv: "--ghc-option=-optl=-L${drv}/lib") staticLibs);
-        };
-      in {
+      {
         # Select a non-GMP compiler, usually for software licensing reasons.
         ghc.package = mkIf (stdenv.hostPlatform.isMusl && !gpl)
             buildPackages.haskell-nix.compiler.integer-simple.${compiler};
-
-        # Add GHC flags and libraries for fully static build
-        # packages.pandoc.components.exes.pandoc = withFullyStatic;
-      })
+      }
     ];
   };
   packagesGmp = (project { gpl = true; }).hsPkgs;