Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
zeme-wana committed Mar 26, 2024
1 parent 23e78ad commit 51d2e6e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions nix/project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ let
# Darwin builds, and including them on Linux breaks lorri, so we
# only add these options when building on Darwin.
marlowe-cli.components.exes.marlowe-cli.build-tools =
mkIfDarwin [ pkgs.buildPackages.buildPackages.gitReallyMinimal ];
mkIfDarwin [ pkgs.buildPackages.buildPackages.gitReallyMinimal ]
++ lib.optional pkgs.stdenv.hostPlatform.isMusl [ pkgs.postgresql ];

async-components.ghcOptions = [ "-Werror" ];
cardano-integration.ghcOptions = [ "-Werror" ];
Expand All @@ -87,12 +88,11 @@ let
lib.optional pkgs.stdenv.hostPlatform.isMusl "-L${static-bzip2.out}/lib";

# marlowe-cli.components.exes.marlowe-cli.build-tools =
# lib.optional pkgs.stdenv.hostPlatform.isMusl [ pkgs.postgresql ];

marlowe-cli.components.exes.marlowe-cli.preCheck =
lib.optionalString pkgs.stdenv.hostPlatform.isMusl ''
PATH=${lib.makeBinPath [ pkgs.postgresql ]}:$PATH
'';
# marlowe-cli.components.exes.marlowe-cli.preCheck =
# lib.optionalString pkgs.stdenv.hostPlatform.isMusl ''
# PATH=${lib.makeBinPath [ pkgs.postgresql ]}:$PATH
# '';

# We need to be a bit more careful with setting the static-bzip2 flag here.
# We do not want it to end up in the library component of marlowe-apps.
Expand Down

0 comments on commit 51d2e6e

Please sign in to comment.