From b6207ab81cd2050fe66cb1d70a4341a58ecb8ce6 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sat, 26 Dec 2015 19:37:02 +0300 Subject: ldc: tzdata test fix --- gn/packages/dlanguage.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gn') diff --git a/gn/packages/dlanguage.scm b/gn/packages/dlanguage.scm index 38ac8b0..1aa71fd 100644 --- a/gn/packages/dlanguage.scm +++ b/gn/packages/dlanguage.scm @@ -23,6 +23,7 @@ #:use-module (guix download) #:use-module (guix build-system cmake) #:use-module (gnu packages textutils) + #:use-module (gnu packages base) #:use-module (gnu packages libedit) #:use-module (gnu packages llvm) #:use-module (gnu packages zip) @@ -81,7 +82,13 @@ (substitute* "runtime/phobos/std/process.d" (("/bin/sh") (which "sh")) (("echo") (which "echo"))) + (substitute* "runtime/phobos/std/datetime.d" + (("/usr/share/zoneinfo/") + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo"))) #t)) + + (add-after 'unpack-dmd-testsuite-source 'patch-dmd-testsuite (lambda _ @@ -94,11 +101,12 @@ (inputs `( ("libconfig" ,libconfig) - ("libedit" ,libedit))) + ("libedit" ,libedit) + ("tzdata" ,tzdata)) ;; for tests (native-inputs `(("llvm" ,llvm) ("clang" ,clang) - ("unzip" ,unzip) + ("unzip" ,unzip) ;; for tests ("phobos-src" ;; runtime/phobos ,(origin (method url-fetch) -- cgit v1.2.3