From c5563b48baabe42ee21c840997d2405888e3f65a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 4 Mar 2017 20:26:20 +0100 Subject: [PATCH] R: set TZDIR properly to fix test suite --- pkgs/applications/science/math/R/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 659b648561c..f87a26cda8a 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" ];