Skip to content

Commit da97b1c

Browse files
committed
Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub
2 parents f20f6d2 + c9786c7 commit da97b1c

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

overlays/musl.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isMusl ({
2525
# See https://github.com/input-output-hk/haskell.nix/issues/948
2626
postgresql = (prev.postgresql.overrideAttrs (old: { dontDisableStatic = true; }))
2727
.override { enableSystemd = false; gssSupport = false; };
28+
2829
openssl = prev.openssl.override { static = true; };
2930

31+
icu = (prev.icu.overrideAttrs (old: { configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ]; }));
32+
3033
# Fails on cross compile
3134
nix = prev.nix.overrideAttrs (_: { doInstallCheck = false; });
3235
} // prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.lib.trivial.release "20.03") {

0 commit comments

Comments
 (0)