diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-02 20:09:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-02 20:09:40 +0200 |
| commit | 02217bf69723a2d66ad2076de01056415d3876b3 (patch) | |
| tree | 7144157f5cd67f45246ccc543d5296e02db5d3c1 /nixos/modules | |
| parent | 28e836a320f7d79312f080f4cca02f50d7a34410 (diff) | |
| parent | 5b8072fff6afe5a455d06b8b8f37a6d7e0519986 (diff) | |
| download | nixlib-02217bf69723a2d66ad2076de01056415d3876b3.tar nixlib-02217bf69723a2d66ad2076de01056415d3876b3.tar.gz nixlib-02217bf69723a2d66ad2076de01056415d3876b3.tar.bz2 nixlib-02217bf69723a2d66ad2076de01056415d3876b3.tar.lz nixlib-02217bf69723a2d66ad2076de01056415d3876b3.tar.xz nixlib-02217bf69723a2d66ad2076de01056415d3876b3.tar.zst nixlib-02217bf69723a2d66ad2076de01056415d3876b3.zip | |
Merge #17838: postgresql: Fix use with extensions
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 ''; }; |