diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-11-07 02:53:37 -0800 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-11-07 02:53:37 -0800 |
| commit | 2b8cdc843406cbdce05a2d17eec12f2c9709110e (patch) | |
| tree | 534bdf1c645640b46be9962fe3022796f853275a /pkgs/servers | |
| parent | b541b702ae3f6ad62dc6f9f3917504cfec198b0f (diff) | |
| parent | 912a825d1e9c41d596e43d7440667a1882a0cb6d (diff) | |
| download | nixpkgs-2b8cdc843406cbdce05a2d17eec12f2c9709110e.tar nixpkgs-2b8cdc843406cbdce05a2d17eec12f2c9709110e.tar.gz nixpkgs-2b8cdc843406cbdce05a2d17eec12f2c9709110e.tar.bz2 nixpkgs-2b8cdc843406cbdce05a2d17eec12f2c9709110e.tar.lz nixpkgs-2b8cdc843406cbdce05a2d17eec12f2c9709110e.tar.xz nixpkgs-2b8cdc843406cbdce05a2d17eec12f2c9709110e.tar.zst nixpkgs-2b8cdc843406cbdce05a2d17eec12f2c9709110e.zip | |
Merge pull request #686 from ocharles/postgres92
Disable exec symlink resolution for PostgreSQL 9.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/sql/postgresql/9.2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 46b7e7ff3c5..eb6a2714eb2 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { makeFlags = [ "world" ]; + patches = [ ./disable-resolve_symlinks.patch ]; + installTargets = [ "install-world" ]; LC_ALL = "C"; diff --git a/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch b/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch new file mode 100644 index 00000000000..3e6fd5e838a --- /dev/null +++ b/pkgs/servers/sql/postgresql/disable-resolve_symlinks.patch @@ -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], |