From e035b7bc65fab96a0ca8e64b509d481e1ddfbede Mon Sep 17 00:00:00 2001 From: Beardhatcode Date: Sat, 23 Nov 2024 20:35:30 +0100 Subject: [PATCH] nextcloud30Packages.apps.recognize: ensure node_binary is replaced --- .../servers/nextcloud/packages/apps/recognize.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index 4231f8201da3..80a3293c3b86 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -44,17 +44,18 @@ stdenv.mkDerivation rec { ''; patchPhase = '' - #hardcode node + # Make it clear we are not reading the node in settings sed -i "/'node_binary'/s:'""':'Nix Controled':" recognize/lib/Service/SettingsService.php + # Replace all occurences of node (and check that we actually remved them all) + test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -gt 0 substituteInPlace recognize/lib/**/*.php \ - --replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${nodejs}/bin/node'" - - substituteInPlace recognize/lib/**/*.php \ - --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${nodejs}/bin/node'" - - substituteInPlace recognize/lib/**/*.php \ + --replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${nodejs}/bin/node'" \ + --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${nodejs}/bin/node'" \ --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${nodejs}/bin/node'" + test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -eq 0 + + # Skip trying to install it... (less warnings in the log) sed -i '/public function run/areturn ; //skip' recognize/lib/Migration/InstallDeps.php