Fix the static build (#1534)

* openssl linking fix is required after all * remove Cabal override (obsoleted on new nixpkgs)
2020-05-21 14:47:07 -05:00
parent 48c9ac36b1
commit 3a1844ec8e
8 changed files with 78 additions and 120 deletions
@@ -26,4 +26,9 @@
  # See: https://github.com/NixOS/nixpkgs/pull/87879
  nixpkgs-openssl-split-runtime-dependencies-of-static-builds =
    ./nixpkgs-openssl-split-runtime-dependencies-of-static-builds.patch;
+
+  # Fix how openssl is linked on static builds, see:
+  # https://github.com/nh2/static-haskell-nix/pull/91
+  static-haskell-nix-postgrest-openssl-linking-fix =
+    ./static-haskell-nix-postgrest-openssl-linking-fix.patch;
 }
@@ -0,0 +1,25 @@
+From bb4c1e27e391eff01591fe60830ff68a9ada41ef Mon Sep 17 00:00:00 2001
+From: Remo <remo>
+Date: Wed, 22 Apr 2020 11:58:07 +0200
+Subject: [PATCH] Add postgrest libpq linking fix
+
+---
+ survey/default.nix | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/survey/default.nix b/survey/default.nix
+index b28606c..fd7cde7 100644
+--- a/survey/default.nix
+++ b/survey/default.nix
+@@ -1052,6 +1052,11 @@ let
+                   super.squeal-postgresql
+                   [ final.openssl ]
+                   "--libs openssl";
+              postgrest =
+                addStaticLinkerFlagsWithPkgconfig
+                  super.postgrest
+                  [ final.openssl ]
+                  "--libs openssl";
+ 
+               xml-to-json =
+                 addStaticLinkerFlagsWithPkgconfig