BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #72338 from nkpart/nkpart/fix-rPackages-ModelMetrics

Browse source 
rPackages.ModelMetrics: fix darwin build
This commit is contained in:
Peter Simons 2019-10-31 13:11:43 +01:00 committed by GitHub
commit 6bd0704542
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -277,6 +277,7 @@ let
KFKSDS = [ pkgs.gsl_1 ];
kza = [ pkgs.fftw.dev ];
magick = [ pkgs.imagemagick.dev ];
ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
mvabund = [ pkgs.gsl_1 ];
mwaved = [ pkgs.fftw.dev ];
ncdf4 = [ pkgs.netcdf ];
@ -735,6 +736,11 @@ let
+ 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: {
patchPhase = "patchShebangs configure";
});