diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 12:49:52 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:53:27 +0100 |
| commit | 565bd805e6aea9258ead5449b46c5e56ae0568fb (patch) | |
| tree | 81a23c558823fc865d180bb8b6318d24ec38729d /pkgs/development/r-modules | |
| parent | 25a78f7234ced8840610178a695078b5b08d9e6b (diff) | |
| parent | 97693915e1d31478528ee72e8d1fea5aa384577b (diff) | |
| download | nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.gz nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.bz2 nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.lz nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.xz nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.zst nixlib-565bd805e6aea9258ead5449b46c5e56ae0568fb.zip | |
Merge branch 'master'
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3ad2176fb419..62382a1f72d4 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -369,7 +369,7 @@ let VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ]; WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; - xml2 = [ pkgs.libxml2.dev ]; + xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; affyPLM = [ pkgs.zlib.dev ]; bamsignals = [ pkgs.zlib.dev ]; @@ -411,6 +411,7 @@ let fftw = [ pkgs.pkgconfig ]; geoCount = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ]; + JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; kza = [ pkgs.pkgconfig ]; magick = [ pkgs.pkgconfig ]; mwaved = [ pkgs.pkgconfig ]; @@ -760,6 +761,17 @@ let ''; }); + JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: { + postPatch = '' + for file in {R,src}/*.R; do + sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + preConfigure = '' + patchShebangs configure + ''; + }); + Mposterior = old.Mposterior.overrideDerivation (attrs: { PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); |