b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #165765 from ConnorBaker/patch-1

Browse source
This commit is contained in:
Ben Siraphob 2022-04-04 16:56:52 -05:00 committed by GitHub
parent 4c5bc1cebb f50e41bfd6
commit 0d95d03c98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/r-modules/default.nix
View file

@ -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 ];

2
pkgs/development/r-modules/generic-builder.nix
View file

@ -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"