From 9308b8e1216186053e1a5a94ee1b462f39de4a6b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 8 Apr 2015 12:10:31 -0700
Subject: [PATCH] pgpool: 3.4.1 -> 3.4.2

---
 pkgs/servers/sql/pgpool/default.nix | 20 ++++++++++++++++----
 pkgs/top-level/all-packages.nix     | 17 ++++++-----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index e39fe85fa6a3..137e536e5d84 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -1,14 +1,26 @@
-{ stdenv, fetchurl, postgresql }:
+{ stdenv, fetchurl, postgresql, openssl, pam ? null, libmemcached ? null }:
 
 stdenv.mkDerivation rec {
-  name = "pgpool-II-3.4.1";
+  name = "pgpool-II-3.4.2";
 
   src = fetchurl {
+    name = "${name}.tar.gz";
     url = "http://www.pgpool.net/download.php?f=${name}.tar.gz";
-    sha256 = "11fy4lvh2n04zmywy4vhp229yxdw8fbirrlvz44j1vnarkb664pd";
+    sha256 = "0lf3fvwc2ib4md25a3hnv822nhy9ac06vg0ndw8q9bry66hzwcfh";
   };
 
-  buildInputs = [ postgresql ];
+  buildInputs = [ postgresql openssl pam libmemcached ];
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-openssl"
+  ] ++ stdenv.lib.optional (pam != null) "--with-pam"
+    ++ stdenv.lib.optional (libmemcached != null) "--with-memcached=${libmemcached}";
+
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+  ];
 
   meta = with stdenv.lib; {
     homepage = http://pgpool.net/mediawiki/index.php;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 467389aa799e..e48c9328a23d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8462,20 +8462,15 @@ let
 
   seabios = callPackage ../applications/virtualization/seabios { };
 
-  pgpool92 = callPackage ../servers/sql/pgpool/default.nix {
-    postgresql = postgresql92;
-  };
+  pgpool92 = pgpool.override { postgresql = postgresql92; };
+  pgpool93 = pgpool.override { postgresql = postgresql93; };
+  pgpool94 = pgpool.override { postgresql = postgresql94; };
 
-  pgpool93 = callPackage ../servers/sql/pgpool/default.nix {
-    postgresql = postgresql93;
+  pgpool = callPackage ../servers/sql/pgpool/default.nix {
+    pam = if stdenv.isLinux then pam else null;
+    libmemcached = null; # Detection is broken upstream
   };
 
-  pgpool94 = callPackage ../servers/sql/pgpool/default.nix {
-    postgresql = postgresql94;
-  };
-
-  pgpool = pgpool92;
-
   postgresql = postgresql92;
 
   postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { };