From 7dd3ce2932f8d104fde6ba6165b2e95e22d0ab38 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Fri, 31 May 2024 09:32:05 +1000 Subject: [PATCH] jasp-desktop: disable format hardening for R 4.4.0 --- pkgs/by-name/ja/jasp-desktop/modules.nix | 3 +++ pkgs/by-name/ja/jasp-desktop/package.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix index 1660daa764c1..379b06234c40 100644 --- a/pkgs/by-name/ja/jasp-desktop/modules.nix +++ b/pkgs/by-name/ja/jasp-desktop/modules.nix @@ -33,6 +33,9 @@ let env.INCLUDE_DIR = "../inst/include/jaspColumnEncoder"; + # necessary for R 4.4.0 + hardeningDisable = [ "format" ]; + postPatch = '' mkdir -p inst/include cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 208589e45695..cfc6e71a9a2c 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -66,6 +66,9 @@ stdenv.mkDerivation { "-DCUSTOM_R_PATH=${customREnv}" ]; + # necessary for R 4.4.0 + hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake ninja