diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-20 12:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-20 12:01:36 +0000 |
| commit | 667f4bf8524fa8a282e2c80ae8dbfa5b92bca5e6 (patch) | |
| tree | bed0142925a26661f16aedfbd9cd309e9a87e3c7 /pkgs/by-name/ja | |
| parent | bf54c136c2484855da95c4fee278023a32e2f267 (diff) | |
| parent | 868f39101beff73c62b28383dfab6e61b5ee189e (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/by-name/ja')
| -rw-r--r-- | pkgs/by-name/ja/jasp-desktop/modules.nix | 3 | ||||
| -rw-r--r-- | pkgs/by-name/ja/jasp-desktop/package.nix | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix index 1660daa764c11..379b06234c40b 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 7c78e869caa9a..1b33536dc7d45 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 |