Skip to content

Commit

Permalink
flake: add x86 check to with-utf8
Browse files Browse the repository at this point in the history
  • Loading branch information
d-xo committed Jul 14, 2024
1 parent 644a264 commit 3827486
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,9 @@
hsPkgs = ps :
ps.haskellPackages.override {
overrides = hfinal: hprev: {
with-utf8 = if ps.stdenv.isDarwin
then
ps.haskell.lib.compose.overrideCabal (drv : {
extraLibraries = [ps.libiconv];
}) hprev.with-utf8
with-utf8 =
if (with ps.stdenv; hostPlatform.isDarwin && hostPlatform.isx86)
then ps.haskell.lib.compose.overrideCabal (_ : { extraLibraries = [ps.libiconv]; }) hprev.with-utf8
else hprev.with-utf8;
};
};
Expand Down Expand Up @@ -113,7 +111,7 @@
[
(haskell.lib.compose.overrideCabal (old: { testTarget = "test"; }))
(haskell.lib.compose.addTestToolDepends testDeps)
(haskell.lib.compose.appendBuildFlags ["-v3"])
#(haskell.lib.compose.appendBuildFlags ["-v3"])
(haskell.lib.compose.appendConfigureFlags (
[ "-fci"
"-O2"
Expand Down

0 comments on commit 3827486

Please sign in to comment.