From 0d8030ace63fb06caf481dc58dd21225266199e2 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 17 Jun 2025 17:11:35 +0200 Subject: [PATCH] rPackages.sparklyr: improve onLoad logic --- pkgs/development/r-modules/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c2532f197e4a..cfe8af1583b3 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -2572,11 +2572,17 @@ let sparklyr = old.sparklyr.overrideAttrs (attrs: { # Pyspark's spark is full featured and better maintained than pkgs.spark preConfigure = '' - substituteInPlace R/zzz.R \ - --replace ".onLoad <- function(...) {" \ - ".onLoad <- function(...) { - Sys.setenv(\"SPARK_HOME\" = Sys.getenv(\"SPARK_HOME\", unset = \"${pkgs.python3Packages.pyspark}/${pkgs.python3Packages.python.sitePackages}/pyspark\")) - Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.jdk}\"))" + if grep "onLoad" R/zzz.R; then + echo "onLoad is already present, patch needs to be updated!" + exit 1 + fi + + cat >> R/zzz.R <