diff mbox series

[bug#47355] ekho use new method to fix datadir

Message ID TYCP286MB18974DED26CB6C4B9301C183A3B09@TYCP286MB1897.JPNP286.PROD.OUTLOOK.COM
State New
Headers show
Series [bug#47355] ekho use new method to fix datadir | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

宋文武 Oct. 6, 2021, 10:47 a.m. UTC 
qblade <qblade@protonmail.com> writes:

> I discussed with the developers of this project. It is not recommended
> to use environment variables to specify the datadir, so I switched to
> hard-coded paths.

Hello, I see that while the environment variable EKHO_DATA_PATH is
working fine, hard-coded it may be better.  Also there is a
`-DEKHO_DATA_PATH='"$(datadir)/ekho-data"'` in its Makefile.am, which
should work out-of-the-box without any flags, envs or patching, but it
doesn't...  I'll raise an issue on ekho later for this.

In the meanwhile, we can use this, which is a little better than
patching:
What do you think?  Thanks!
diff mbox series

Patch

diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index cbc46b32b4..10a4f3fa76 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -579,10 +579,12 @@  control.")
        ("libsndfile" ,libsndfile)
        ("pulseaudio" ,pulseaudio)))
     (build-system gnu-build-system)
-    (native-search-paths
-     (list (search-path-specification
-            (variable "EKHO_DATA_PATH")
-            (files '("share/ekho-data")))))
+    (arguments
+     '(#:configure-flags
+       (let* ((datadir (string-append (assoc-ref %outputs "out") "/share"))
+              (ekhodatadir (string-append datadir "/ekho-data")))
+         (list (simple-format #f "CXXFLAGS=-DEKHO_DATA_PATH='\"~a\"'"
+                              ekhodatadir)))))
     (home-page "https://eguidedog.net/ekho.php")
     (synopsis "Chinese text-to-speech software")
     (description