public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34041 from mnacamura/r-datatable-openmp 

rPackages.data_table: OpenMP support on Darwin
This commit is contained in:
Peter Simons 2018-01-19 12:40:09 +01:00 committed by GitHub
parent fa82eeff37 2533720976
commit f88720e3b2
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

@ -246,6 +246,7 @@ let
ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
cit = [ pkgs.gsl_1 ]; cit = [ pkgs.gsl_1 ];
curl = [ pkgs.curl.dev ]; curl = [ pkgs.curl.dev ];
data_table = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ];
diversitree = [ pkgs.gsl_1 pkgs.fftw ]; diversitree = [ pkgs.gsl_1 pkgs.fftw ];
EMCluster = [ pkgs.liblapack ]; EMCluster = [ pkgs.liblapack ];
@ -744,6 +745,11 @@ let
patchPhase = "patchShebangs configure"; patchPhase = "patchShebangs configure";
}); });
data_table = old.data_table.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";
}); });