diff options
author | Julien Lepiller <julien@lepiller.eu> | 2018-07-28 17:38:38 +0200 |
---|---|---|
committer | Julien Lepiller <julien@lepiller.eu> | 2018-10-04 22:26:02 +0200 |
commit | c336567dad48c5cdae0b442b58fae70a83b03e9b (patch) | |
tree | 34bae3a9df75ae56b72b4fe0deaa9b05400697e0 /gnu | |
parent | 030c912616c8ee1595218e304460041bcb4f1ceb (diff) | |
download | guix-patches-c336567dad48c5cdae0b442b58fae70a83b03e9b.tar guix-patches-c336567dad48c5cdae0b442b58fae70a83b03e9b.tar.gz |
gnu: postgresql: Fix finding extensions.
* gnu/packages/patches/postgresql-disable-resolve_symlinks.patch: New
file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/databases.scm (postgresql)[source]: Use it.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/local.mk | 1 | ||||
-rw-r--r-- | gnu/packages/databases.scm | 5 | ||||
-rw-r--r-- | gnu/packages/patches/postgresql-disable-resolve_symlinks.patch | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 60db25a60c..c3bc35a80a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1042,6 +1042,7 @@ dist_patch_DATA = \ %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ + %D%/packages/patches/postgresql-disable-resolve_symlinks.patch \ %D%/packages/patches/potrace-tests.patch \ %D%/packages/patches/procmail-ambiguous-getline-debian.patch \ %D%/packages/patches/procmail-CVE-2014-3618.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index dc8e52036c..02bfbda6b0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2017 Adriano Peluso <catonano@gmail.com> @@ -814,7 +814,8 @@ as a drop-in replacement of MySQL.") version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")))) + "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc")) + (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-uuid=e2fs") diff --git a/gnu/packages/patches/postgresql-disable-resolve_symlinks.patch b/gnu/packages/patches/postgresql-disable-resolve_symlinks.patch new file mode 100644 index 0000000000..97ef6928fe --- /dev/null +++ b/gnu/packages/patches/postgresql-disable-resolve_symlinks.patch @@ -0,0 +1,25 @@ +From 223c82d1d6ed1f29f26307249827ff679e09c780 Mon Sep 17 00:00:00 2001 +From: Julien Lepiller <julien@lepiller.eu> +Date: Sat, 28 Jul 2018 12:22:12 +0200 +Subject: [PATCH] disable resolve_symlink + +--- + src/common/exec.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/common/exec.c b/src/common/exec.c +index 878fc29..6b3e283 100644 +--- a/src/common/exec.c ++++ b/src/common/exec.c +@@ -218,6 +218,8 @@ find_my_exec(const char *argv0, char *retpath) + static int + resolve_symlinks(char *path) + { ++ // On GuixSD we *want* stuff relative to symlinks. ++ return 0; + #ifdef HAVE_READLINK + struct stat buf; + char orig_wd[MAXPGPATH], +-- +2.18.0 + |