diff options
author | Peter Simons <simons@cryp.to> | 2019-10-31 13:11:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-31 13:11:43 +0100 |
commit | 6bd0704542c852c3744f2ebe773876a75e1a18df (patch) | |
tree | e6d77080e6aef2f963e343472903a1d0f1ec94a4 | |
parent | c364c6f09f0f5ff099aad6de29cccd727c5dd25f (diff) | |
parent | f21ac0e4dcd62871ef80b62b3c688c80ced8cf63 (diff) | |
download | nixpkgs-6bd0704542c852c3744f2ebe773876a75e1a18df.tar nixpkgs-6bd0704542c852c3744f2ebe773876a75e1a18df.tar.gz nixpkgs-6bd0704542c852c3744f2ebe773876a75e1a18df.tar.bz2 nixpkgs-6bd0704542c852c3744f2ebe773876a75e1a18df.tar.lz nixpkgs-6bd0704542c852c3744f2ebe773876a75e1a18df.tar.xz nixpkgs-6bd0704542c852c3744f2ebe773876a75e1a18df.tar.zst nixpkgs-6bd0704542c852c3744f2ebe773876a75e1a18df.zip |
Merge pull request #72338 from nkpart/nkpart/fix-rPackages-ModelMetrics
rPackages.ModelMetrics: fix darwin build
-rw-r--r-- | pkgs/development/r-modules/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 990a8fb85de..afb23ed5438 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -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"; }); |