[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/08: gnu: kodi: Embed full path to tzdata.

From: Marius Bakke
Subject: 06/08: gnu: kodi: Embed full path to tzdata.
Date: Thu, 30 Mar 2017 16:36:30 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 8c0117371a163240a487a6eee3d7992a9df327ea
Author: Marius Bakke <address@hidden>
Date:   Fri Mar 24 08:28:46 2017 +0100

    gnu: kodi: Embed full path to tzdata.
    * gnu/packages/kodi.scm (kodi)[arguments]: Add substitution for tzdata in
    'patch-stuff' phase.
    [inputs]: Add TZDATA.
 gnu/packages/kodi.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index a60e2c0..4845c66 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -302,7 +302,7 @@ generator library for C++.")
                           (zero? (system* "autoreconf" "-vif"))))
          (add-after 'bootstrap-bundled-software 'patch-stuff
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              ;; Prevent the build scripts from calling autoreconf in the
              ;; build stage.  Otherwise, it would undo the bootstrapping
              ;; and shebang patching that we worked so hard for.
@@ -316,6 +316,11 @@ generator library for C++.")
                ;; to make them writable before the build process starts.
                (("autoreconf -vif") "chmod -R u+w ."))
+             (substitute* "xbmc/linux/LinuxTimezone.cpp"
+               (("/usr/share/zoneinfo")
+                (string-append (assoc-ref inputs "tzdata")
+                               "/share/zoneinfo")))
              ;; Let's disable some tests that are known not to work here.
              ;; Doing this later while in the cmake "../build" directory
              ;; is trickier.
@@ -416,6 +421,7 @@ generator library for C++.")
        ("sqlite" ,sqlite)
        ("taglib" ,taglib)
        ("tinyxml" ,tinyxml)
+       ("tzdata" ,tzdata)
        ("util-linux" ,util-linux)
        ("zip" ,zip)
        ("zlib" ,zlib)))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]