diff --git a/.travis.yml b/.travis.yml index dc6b18e..8ee8a83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,9 @@ script: - GUIX_PACKAGE_PATH=. guix build --no-grafts --fallback --substitute-urls="https://ci.guixsd.org https://mirror.hydra.gnu.org" $(grep define-public $FILE | cut -f2 -d' ') notifications: - email: false + email: + on_success: never + on_failure: always git: depth: 10 diff --git a/wip/epour.scm b/wip/epour.scm index a73519d..27f25fd 100644 --- a/wip/epour.scm +++ b/wip/epour.scm @@ -96,7 +96,7 @@ Foundation Libraries} (EFL) and rb-libtorrent.") ,@(alist-delete "boost" (package-inputs libtorrent-rasterbar)))) (native-inputs - `(("python" ,python) + `(("python" ,python-3) ,@(alist-delete "python" (package-native-inputs libtorrent-rasterbar)))))) @@ -104,6 +104,6 @@ Foundation Libraries} (EFL) and rb-libtorrent.") (package (inherit boost) (native-inputs - `(("python" ,python) + `(("python" ,python-3) ,@(alist-delete "python" (package-native-inputs boost)))))) diff --git a/wip/hspell.scm b/wip/hspell.scm index 9ca3510..c19e5f8 100644 --- a/wip/hspell.scm +++ b/wip/hspell.scm @@ -40,10 +40,13 @@ "18xymabvwr47gi4w2sw1galpvvq2hrjpj4aw45nivlj0hzaza43k")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--enable-fatverb" + '(#:configure-flags (list "--enable-fatverb" "--enable-linginfo" "--enable-shared" - "--enable-test") + "--enable-test" + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib")) #:test-target "test" #:phases (modify-phases %standard-phases @@ -81,25 +84,27 @@ (install-file "hspell.3" man3) (install-file "linginfo.h" inc) (install-file "hspell.h" inc) - (install-file "libhspell.so.0" lib) - (symlink "libhspell.so.0" (string-append lib "/libhspell.so"))) - #t)) - (add-after 'install 'wrap-binaries - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (lib (string-append out "/lib"))) - (for-each - (lambda (file) - (wrap-program file - `("PATH" ":" prefix (,lib)))) - (find-files bin ".*"))) + (when (file-exists? "libhspell.so.0") + (install-file "libhspell.so.0" lib) + (symlink "libhspell.so.0" (string-append lib "/libhspell.so")))) + ; #t)) + ;(add-after 'install 'wrap-binaries + ; (lambda* (#:key outputs #:allow-other-keys) + ; (let* ((out (assoc-ref outputs "out")) + ; (bin (string-append out "/bin")) + ; (lib (string-append out "/lib"))) + ; (for-each + ; (lambda (file) + ; (wrap-program file + ; `("PATH" ":" prefix (,lib)))) + ; (find-files bin ".*"))) #t))))) - (inputs + (native-inputs `(("aspell" ,aspell) ("aspell-dict-he" ,aspell-dict-he) - ("hunspell" ,hunspell) - ("perl" ,perl) + ("hunspell" ,hunspell))) + (inputs + `(("perl" ,perl) ("zlib" ,zlib))) (home-page "http://hspell.ivrix.org.il/") (synopsis "Hebrew linguistic tool")