mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 16:11:58 +00:00
d75c296dc2
https://roundcube.net/news/2019/11/09/roundcube-1.4.0-released * `curl` cmd in the test can fail as roundcube returns a http/401 if unauthorized (and we're explicitly requesting the login form). By checking if the `persistent_login` plugin is loaded, the assertion is still valid) * Use `$argv[0]` to determine install path in the installer script. I'm not exactly sure why, but it seems as `__DIR__` now resolves symlinks which breaks the installer if roundcube is in a `buildEnv` with third-party plugins.
28 lines
836 B
Diff
28 lines
836 B
Diff
From c1832eabb99cec47f1714f696275285e1e28da34 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Bosch <maximilian@mbosch.me>
|
|
Date: Tue, 2 Apr 2019 16:20:50 +0200
|
|
Subject: [PATCH] Don't resolve symlinks when trying to find INSTALL_PATH
|
|
|
|
Nix specific patch. This behavior breaks roundcube setups where plugins
|
|
are in a store path with symlinks to the actual source.
|
|
---
|
|
bin/update.sh | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/bin/update.sh b/bin/update.sh
|
|
index 08e3bb5..b2ad498 100755
|
|
--- a/bin/update.sh
|
|
+++ b/bin/update.sh
|
|
@@ -19,7 +19,7 @@
|
|
+-----------------------------------------------------------------------+
|
|
*/
|
|
|
|
-define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
|
|
+define('INSTALL_PATH', dirname(dirname($argv[0])).'/');
|
|
|
|
require_once INSTALL_PATH . 'program/include/clisetup.php';
|
|
|
|
--
|
|
2.19.2
|
|
|