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 /pkgs/servers/sql | |
| 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 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b58ca5f44b9c..c0e97dab8125 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -33,6 +33,7 @@ let [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) ./less-is-more.patch ./hardcode-pgxs-path.patch + ./specify_pkglibdir_at_runtime.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch b/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch new file mode 100644 index 000000000000..fe95d2ee99f0 --- /dev/null +++ b/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch @@ -0,0 +1,29 @@ +diff -ur postgresql-9.5.3-orig/src/port/path.c postgresql-9.5.3/src/port/path.c +--- postgresql-9.5.3-orig/src/port/path.c 2016-05-09 22:50:23.000000000 +0200 ++++ postgresql-9.5.3/src/port/path.c 2016-08-29 22:44:10.507377613 +0200 +@@ -714,7 +714,11 @@ + void + get_lib_path(const char *my_exec_path, char *ret_path) + { +- make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); ++ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); ++ if(nix_pglibdir == NULL) ++ make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); ++ else ++ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); + } + + /* +@@ -723,7 +727,11 @@ + void + get_pkglib_path(const char *my_exec_path, char *ret_path) + { +- make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); ++ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); ++ if(nix_pglibdir == NULL) ++ make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); ++ else ++ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); + } + + /* |