From 51d2e6ed07763e17af47b6928b08f222d3df4984 Mon Sep 17 00:00:00 2001 From: zeme Date: Tue, 26 Mar 2024 18:02:18 +0100 Subject: [PATCH] wip --- nix/project.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/project.nix b/nix/project.nix index 85ed02ae95..8ca3aff039 100644 --- a/nix/project.nix +++ b/nix/project.nix @@ -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" ]; @@ -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.