diff options
| author | Peter Simons <simons@cryp.to> | 2017-03-04 20:26:20 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-03-07 14:56:46 +0100 |
| commit | c5563b48baabe42ee21c840997d2405888e3f65a (patch) | |
| tree | 6d92f0ccf3ab21a647df84609c49a38ba1782c12 /pkgs/applications/science/math/R | |
| parent | 6b3eec627e55158c08034b739a4ec9f2e12b98af (diff) | |
| download | nixlib-c5563b48baabe42ee21c840997d2405888e3f65a.tar nixlib-c5563b48baabe42ee21c840997d2405888e3f65a.tar.gz nixlib-c5563b48baabe42ee21c840997d2405888e3f65a.tar.bz2 nixlib-c5563b48baabe42ee21c840997d2405888e3f65a.tar.lz nixlib-c5563b48baabe42ee21c840997d2405888e3f65a.tar.xz nixlib-c5563b48baabe42ee21c840997d2405888e3f65a.tar.zst nixlib-c5563b48baabe42ee21c840997d2405888e3f65a.zip | |
R: set TZDIR properly to fix test suite
Diffstat (limited to 'pkgs/applications/science/math/R')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 659b648561cf..f87a26cda8a5 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -55,15 +55,8 @@ stdenv.mkDerivation rec { OBJC="clang" '' + '' ) - echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in - ''; - - # This Darwin-specific patch has almost certainly become unnecessary. Can - # some Darwin user please verify that the R build still succeeds if this is - # removed? - postConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R - sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c + echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib" + echo >>etc/Renviron.in "TZDIR=${tzdata}/share/zoneinfo" ''; installTargets = [ "install" "install-info" "install-pdf" ]; |