From cf84a442725add49f837b7a6a35eac0e63b2d459 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Nov 2010 22:37:39 +0000
Subject: [PATCH] * Use buildEnv with a postBuild hook rather than
 buildEnvScript.

svn path=/nixos/trunk/; revision=24593
---
 modules/services/databases/postgresql.nix | 24 +++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index 6d58b757421..56e98e4a3f9 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -9,22 +9,16 @@ let
   # see description of extraPlugins
   postgresqlAndPlugins = pg:
     if cfg.extraPlugins == [] then pg
-    else pkgs.runCommand "postgresql-and-plugins" {
-      inherit (pkgs) perl;
-      inherit pg;
-      # used by env builder:
+    else pkgs.buildEnv {
+      name = "postgresql-and-plugins";
       paths = [ pg ] ++ cfg.extraPlugins;
-      pathsToLink = "/";
-      ignoreCollisions = 0;
-      manifest = null;
-    }
-      ''
-        perlScript=${pkgs.buildEnvScript}
-        mkdir -p $out/bin
-        $perl/bin/perl $perlScript
-        rm $out/bin/{pg_config,postgres,pg_ctl}
-        cp --target-directory=$out/bin $pg/bin/{postgres,pg_config,pg_ctl}
-      '';
+      postBuild =
+        ''
+          mkdir -p $out/bin
+          rm $out/bin/{pg_config,postgres,pg_ctl}
+          cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl}
+        '';
+    };
 
   postgresql = postgresqlAndPlugins pkgs.postgresql;