forked from mirrors/nixpkgs
Merge pull request #72338 from nkpart/nkpart/fix-rPackages-ModelMetrics
rPackages.ModelMetrics: fix darwin build
This commit is contained in:
commit
6bd0704542
|
@ -277,6 +277,7 @@ let
|
||||||
KFKSDS = [ pkgs.gsl_1 ];
|
KFKSDS = [ pkgs.gsl_1 ];
|
||||||
kza = [ pkgs.fftw.dev ];
|
kza = [ pkgs.fftw.dev ];
|
||||||
magick = [ pkgs.imagemagick.dev ];
|
magick = [ pkgs.imagemagick.dev ];
|
||||||
|
ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
|
||||||
mvabund = [ pkgs.gsl_1 ];
|
mvabund = [ pkgs.gsl_1 ];
|
||||||
mwaved = [ pkgs.fftw.dev ];
|
mwaved = [ pkgs.fftw.dev ];
|
||||||
ncdf4 = [ pkgs.netcdf ];
|
ncdf4 = [ pkgs.netcdf ];
|
||||||
|
@ -735,6 +736,11 @@ let
|
||||||
+ lib.optionalString stdenv.isDarwin " -fopenmp";
|
+ lib.optionalString stdenv.isDarwin " -fopenmp";
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: {
|
||||||
|
NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE
|
||||||
|
+ lib.optionalString stdenv.isDarwin " -fopenmp";
|
||||||
|
});
|
||||||
|
|
||||||
rpf = old.rpf.overrideDerivation (attrs: {
|
rpf = old.rpf.overrideDerivation (attrs: {
|
||||||
patchPhase = "patchShebangs configure";
|
patchPhase = "patchShebangs configure";
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue