Skip to content

Commit

Permalink
Add libpq to static build
Browse files Browse the repository at this point in the history
  • Loading branch information
zeme-wana committed Mar 26, 2024
1 parent 90b997f commit 2d321a7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 2 additions & 4 deletions nix/outputs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ let


static =
staticPkgs.marlowe-apps.components.exes
//
staticPkgs.marlowe-cli.components.exes
;
staticPkgs.marlowe-apps.components.exes //
staticPkgs.marlowe-cli.components.exes;


allStatic = pkgs.runCommand "all-statics" { } ''
Expand Down
6 changes: 5 additions & 1 deletion nix/project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ let
marlowe-actus.ghcOptions = [ "-Werror" ];
marlowe-contracts.ghcOptions = [ "-Werror" ];

marlowe-cli.ghcOptions = [ "-Werror" ] ++ lib.optional pkgs.stdenv.hostPlatform.isMusl "-L${static-bzip2.out}/lib";
marlowe-cli.ghcOptions =
[ "-Werror" ] ++
lib.optional pkgs.stdenv.hostPlatform.isMusl "-L${static-bzip2.out}/lib" ++
lib.optional pkgs.stdenv.hostPlatform.isMusl "-L${pkgs.postgresql.lib}/lib";

# 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.
marlowe-apps.ghcOptions = [ "-Werror" ] ++ lib.optional pkgs.stdenv.hostPlatform.isMusl "-L${static-bzip2.out}/lib";
Expand Down

0 comments on commit 2d321a7

Please sign in to comment.