diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2022-04-04 16:56:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 16:56:52 -0500 |
| commit | 0d95d03c98f2ecef7c721cb6e0a638bbbff44d0a (patch) | |
| tree | e5cb3ab0b43e3d7482d665036640d0951051bb98 /pkgs/development/r-modules | |
| parent | 4c5bc1cebbee24083e9c14fef744ab1fb5fc9e13 (diff) | |
| parent | f50e41bfd60a7c705086354e020807d0295c3526 (diff) | |
Merge pull request #165765 from ConnorBaker/patch-1
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index fce57c0893e8e..c8f8934e866a1 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -362,7 +362,7 @@ let mwaved = [ pkgs.fftw.dev ]; mzR = with pkgs; [ zlib boost159.dev netcdf ]; ncdf4 = [ pkgs.netcdf ]; - nloptr = with pkgs; [ nlopt pkg-config ]; + nloptr = with pkgs; [ nlopt pkg-config libiconv ]; n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; pander = with pkgs; [ pandoc which ]; diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 880fff44ed644..beb669d9893f4 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation ({ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + configurePhase = '' runHook preConfigure export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" |