cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rss-bridge: Move substitutions into patch file

Browse source 
As requested in https://github.com/NixOS/nixpkgs/pull/257641#pullrequestreview-1678477898
This commit is contained in:
Mynacol 2023-10-16 21:19:03 +02:00 committed by Yaya
parent e9ea06e57f
commit c2c5d261ab
2 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/servers/web-apps/rss-bridge/default.nix
View file

@ -11,14 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU="; sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU=";
}; };
postPatch = '' patches = [
substituteInPlace lib/RssBridge.php \ ./paths.patch
--replace "__DIR__ . '/../config.ini.php'" "getenv('RSSBRIDGE_DATA') . '/config.ini.php'" ];
substituteInPlace lib/bootstrap.php \
--replace "const PATH_CACHE = __DIR__ . '/../cache/';" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');"
substituteInPlace lib/Configuration.php \
--replace "__DIR__ . '/../whitelist.txt'" "getenv('RSSBRIDGE_DATA') . '/whitelist.txt'"
'';
installPhase = '' installPhase = ''
mkdir $out/ mkdir $out/

43
pkgs/servers/web-apps/rss-bridge/paths.patch Normal file
View file

@ -0,0 +1,43 @@
diff --git a/lib/Configuration.php b/lib/Configuration.php
index c38d7cc9..d95e5174 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -104,8 +104,8 @@ final class Configuration
}
}
- if (file_exists(__DIR__ . '/../whitelist.txt')) {
- $enabledBridges = trim(file_get_contents(__DIR__ . '/../whitelist.txt'));
+ if (file_exists(getenv('RSSBRIDGE_DATA') . '/whitelist.txt')) {
+ $enabledBridges = trim(file_get_contents(getenv('RSSBRIDGE_DATA') . '/whitelist.txt'));
if ($enabledBridges === '*') {
self::setConfig('system', 'enabled_bridges', ['*']);
} else {
diff --git a/lib/RssBridge.php b/lib/RssBridge.php
index 6ba952eb..a0bbaf03 100644
--- a/lib/RssBridge.php
+++ b/lib/RssBridge.php
@@ -11,8 +11,8 @@ final class RssBridge
Configuration::verifyInstallation();
$customConfig = [];
- if (file_exists(__DIR__ . '/../config.ini.php')) {
- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED);
+ if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) {
+ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED);
}
Configuration::loadConfiguration($customConfig, getenv());
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index dc1c0f04..194a3f8f 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -27,7 +27,7 @@ const PATH_LIB_CACHES = __DIR__ . '/../caches/';
const PATH_LIB_ACTIONS = __DIR__ . '/../actions/';
/** Path to the cache folder */
-const PATH_CACHE = __DIR__ . '/../cache/';
+define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');
/** URL to the RSS-Bridge repository */
const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/';