ldc: tzdata test fix

2 files changed, 13 insertions, 10 deletions

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)
diff --git a/ldc-disable-tests.patch b/ldc-disable-tests.patch
index d88aa21..1e13ea6 100644
--- a/ldc-disable-tests.patch
+++ b/ldc-disable-tests.patch
@@ -1,20 +1,15 @@
 diff --git a/std/datetime.d b/std/datetime.d
-index 8e4ed3b..d904a49 100644
+index 8e4ed3b..1be9099 100644
 --- a/std/datetime.d
 +++ b/std/datetime.d
-@@ -28018,7 +28018,11 @@ public:
+@@ -28018,6 +28018,7 @@ public:
              The default directory where the TZ Database files are. It's empty
              for Windows, since Windows doesn't have them.
            +/
--        enum defaultTZDatabaseDir = "/usr/share/zoneinfo/";
 +          
-+        pragma(msg, "test disabled on GNU Guix");
-+
-+        // enum defaultTZDatabaseDir = "/usr/share/zoneinfo/";
-+        enum defaultTZDatabaseDir = "";
+         enum defaultTZDatabaseDir = "/usr/share/zoneinfo/";
      }
      else version(Windows)
-     {
 diff --git a/std/path.d b/std/path.d
 index 254d8f0..b0fc04d 100644
 --- a/std/path.d