Skip to content

Commit

Permalink
fix(build): Disable C++ flags for text
Browse files Browse the repository at this point in the history
  • Loading branch information
sgillespie committed Jan 24, 2024
1 parent a417fa5 commit 520bd28
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
7 changes: 6 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,15 @@ package cryptonite
-- generation is dubious. Set the flag so we use /dev/urandom by default.
flags: -support_rdrand

-- Do not depend on C++ for slightly faster utf8 parsing.
package text
flags: -simdutf

-- concurrent-output is incompatible with our haskell.nix version due to
-- arch(wasm32).
-- TODO[sgillespie]: Upgrade haskell.nix
constraints: concurrent-output < 1.10.19
constraints:
, concurrent-output < 1.10.19

-- ---------------------------------------------------------
-- Enable tests
Expand Down
14 changes: 9 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,18 @@
echo "file binary-dist $out/$NAME" > $out/nix-support/hydra-build-products
'';

project = (nixpkgs.haskell-nix.cabalProject' ({ config, lib, ... }: rec {
project = (nixpkgs.haskell-nix.cabalProject' ({ config, lib, pkgs, ... }: rec {
src = ./.;
name = "cardano-db-sync";
compiler-nix-name = lib.mkDefault "ghc8107";
compiler-nix-name =
if system == "x86_64-linux"
then lib.mkDefault "ghc810"
else lib.mkDefault "ghc963";
flake.variants =
lib.genAttrs
["ghc963"]
(compiler-nix-name: { inherit compiler-nix-name; });
let
compilers = lib.optionals (system == "x86_64-linux") ["ghc963"];
in
lib.genAttrs compilers (c: { compiler-nix-name = c; });

inputMap = {
"https://chap.intersectmbo.org/" = inputs.CHaP;
Expand Down

0 comments on commit 520bd28

Please sign in to comment.