Merge pull request #50 from GuillaumedeVolpiano/develop

adding a pkgconfig-depends on libpq

Author: alexfmpe

default.nix

@@ -9,10 +9,11 @@
     (drv: {
       testSystemDepends = (drv.testSystemDepends or []) ++ [ (if postgresql == null then pkgs.postgresql else postgresql) ];
     });
-  gargoyle-postgresql-nix = pkgs.haskell.lib.overrideCabal
-    (haskellPackages.callCabal2nix "gargoyle-postgresql-nix" ./gargoyle-postgresql-nix {})
-    (drv: {
-      librarySystemDepends = (drv.librarySystemDepends or []) ++ [ (if postgresql == null then pkgs.postgresql else postgresql) ];
-    });
+
+  gargoyle-postgresql-nix = haskellPackages.callCabal2nix "gargoyle-postgresql-nix" ./gargoyle-postgresql-nix {
+    # TODO: libpq will become standalone in https://github.com/NixOS/nixpkgs/pull/359659
+    libpq = postgresql;
+  };
+
   gargoyle-postgresql-connect = haskellPackages.callCabal2nix "gargoyle-postgresql-connect" ./gargoyle-postgresql-connect {};
 }

gargoyle-postgresql-nix/gargoyle-postgresql-nix.cabal

@@ -29,7 +29,8 @@ library
     , gargoyle             >=0.1  && <0.2
     , gargoyle-postgresql  >=0.2  && <0.3
     , which                >=0.2  && <0.3
-
+  pkgconfig-depends:
+    libpq
   hs-source-dirs:   src
   default-language: Haskell2010