Merge pull request #165765 from ConnorBaker/patch-1
This commit is contained in:
commit
0d95d03c98
|
@ -362,7 +362,7 @@ let
|
||||||
mwaved = [ pkgs.fftw.dev ];
|
mwaved = [ pkgs.fftw.dev ];
|
||||||
mzR = with pkgs; [ zlib boost159.dev netcdf ];
|
mzR = with pkgs; [ zlib boost159.dev netcdf ];
|
||||||
ncdf4 = [ pkgs.netcdf ];
|
ncdf4 = [ pkgs.netcdf ];
|
||||||
nloptr = with pkgs; [ nlopt pkg-config ];
|
nloptr = with pkgs; [ nlopt pkg-config libiconv ];
|
||||||
n1qn1 = [ pkgs.gfortran ];
|
n1qn1 = [ pkgs.gfortran ];
|
||||||
odbc = [ pkgs.unixODBC ];
|
odbc = [ pkgs.unixODBC ];
|
||||||
pander = with pkgs; [ pandoc which ];
|
pander = with pkgs; [ pandoc which ];
|
||||||
|
|
|
@ -10,6 +10,8 @@ stdenv.mkDerivation ({
|
||||||
NIX_CFLAGS_COMPILE =
|
NIX_CFLAGS_COMPILE =
|
||||||
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
||||||
|
|
||||||
|
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
runHook preConfigure
|
runHook preConfigure
|
||||||
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
|
export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
|
||||||
|
|
Loading…
Reference in a new issue