Author: eelco
Date: Wed Nov 3 22:37:39 2010
New Revision: 24593
URL: https://svn.nixos.org/websvn/nix/?rev=24593&sc=1
Log:
* Use buildEnv with a postBuild hook rather than buildEnvScript.
Modified:
nixos/trunk/modules/services/databases/postgresql.nix
Modified: nixos/trunk/modules/services/databases/postgresql.nix
==============================================================================
--- nixos/trunk/modules/services/databases/postgresql.nix Wed Nov 3
22:37:00 2010 (r24592)
+++ nixos/trunk/modules/services/databases/postgresql.nix Wed Nov 3
22:37:39 2010 (r24593)
@@ -9,22 +9,16 @@
# 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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
