Skip to content

Commit 520bd28

Browse files
committed
fix(build): Disable C++ flags for text
1 parent a417fa5 commit 520bd28

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

cabal.project

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,15 @@ package cryptonite
4444
-- generation is dubious. Set the flag so we use /dev/urandom by default.
4545
flags: -support_rdrand
4646

47+
-- Do not depend on C++ for slightly faster utf8 parsing.
48+
package text
49+
flags: -simdutf
50+
4751
-- concurrent-output is incompatible with our haskell.nix version due to
4852
-- arch(wasm32).
4953
-- TODO[sgillespie]: Upgrade haskell.nix
50-
constraints: concurrent-output < 1.10.19
54+
constraints:
55+
, concurrent-output < 1.10.19
5156

5257
-- ---------------------------------------------------------
5358
-- Enable tests

flake.nix

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,18 @@
146146
echo "file binary-dist $out/$NAME" > $out/nix-support/hydra-build-products
147147
'';
148148

149-
project = (nixpkgs.haskell-nix.cabalProject' ({ config, lib, ... }: rec {
149+
project = (nixpkgs.haskell-nix.cabalProject' ({ config, lib, pkgs, ... }: rec {
150150
src = ./.;
151151
name = "cardano-db-sync";
152-
compiler-nix-name = lib.mkDefault "ghc8107";
152+
compiler-nix-name =
153+
if system == "x86_64-linux"
154+
then lib.mkDefault "ghc810"
155+
else lib.mkDefault "ghc963";
153156
flake.variants =
154-
lib.genAttrs
155-
["ghc963"]
156-
(compiler-nix-name: { inherit compiler-nix-name; });
157+
let
158+
compilers = lib.optionals (system == "x86_64-linux") ["ghc963"];
159+
in
160+
lib.genAttrs compilers (c: { compiler-nix-name = c; });
157161

158162
inputMap = {
159163
"https://chap.intersectmbo.org/" = inputs.CHaP;

0 commit comments

Comments
 (0)