Merge pull request #686 from ocharles/postgres92
Disable exec symlink resolution for PostgreSQL 9.2
This commit is contained in:
commit
2b8cdc8434
@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
makeFlags = [ "world" ];
|
makeFlags = [ "world" ];
|
||||||
|
|
||||||
|
patches = [ ./disable-resolve_symlinks.patch ];
|
||||||
|
|
||||||
installTargets = [ "install-world" ];
|
installTargets = [ "install-world" ];
|
||||||
|
|
||||||
LC_ALL = "C";
|
LC_ALL = "C";
|
||||||
|
14
pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch
Normal file
14
pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/src/port/exec.c b/src/port/exec.c
|
||||||
|
index c79e8ba..42c4091 100644
|
||||||
|
--- a/src/port/exec.c
|
||||||
|
+++ b/src/port/exec.c
|
||||||
|
@@ -216,6 +216,9 @@ find_my_exec(const char *argv0, char *retpath)
|
||||||
|
static int
|
||||||
|
resolve_symlinks(char *path)
|
||||||
|
{
|
||||||
|
+ // On NixOS we *want* stuff relative to symlinks.
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
#ifdef HAVE_READLINK
|
||||||
|
struct stat buf;
|
||||||
|
char orig_wd[MAXPGPATH],
|
Loading…
x
Reference in New Issue
Block a user