diff options
author | Lancelot SIX <lsix@lancelotsix.com> | 2016-08-19 09:06:40 +0200 |
---|---|---|
committer | Lancelot SIX <lsix@lancelotsix.com> | 2016-09-02 11:51:21 +0200 |
commit | 5b8072fff6afe5a455d06b8b8f37a6d7e0519986 (patch) | |
tree | 9a4bf5397bbff921b78261cb347357f81801032b /nixos/modules | |
parent | f976fa40a238e9bf78fd1a875dbd2f23318acf6a (diff) | |
download | nixlib-5b8072fff6afe5a455d06b8b8f37a6d7e0519986.tar nixlib-5b8072fff6afe5a455d06b8b8f37a6d7e0519986.tar.gz nixlib-5b8072fff6afe5a455d06b8b8f37a6d7e0519986.tar.bz2 nixlib-5b8072fff6afe5a455d06b8b8f37a6d7e0519986.tar.lz nixlib-5b8072fff6afe5a455d06b8b8f37a6d7e0519986.tar.xz nixlib-5b8072fff6afe5a455d06b8b8f37a6d7e0519986.tar.zst nixlib-5b8072fff6afe5a455d06b8b8f37a6d7e0519986.zip |
postgresql: Fix use with extensions
Fixes #15512 and #16032 With the multi output, postgresql cannot find at runtime what is its basedir when looking for libdir and pkglibdir. This commit fixes that.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 9988fc6e63be..24ef4637ec98 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -11,12 +11,14 @@ let if cfg.extraPlugins == [] then pg else pkgs.buildEnv { name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}"; - paths = [ pg ] ++ cfg.extraPlugins; + paths = [ pg pg.lib ] ++ cfg.extraPlugins; + buildInputs = [ pkgs.makeWrapper ]; 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} + wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib ''; }; |