mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: kodi: Remove silly wrapper script.
* gnu/packages/kodi.scm (kodi)[arguments]: Add SYSTEM_LDFLAGS in configure-flags. Remove 'wrap' phase. Enable previously failing tests.
This commit is contained in:
parent
8c0117371a
commit
4951d2f386
1 changed files with 3 additions and 12 deletions
|
@ -286,6 +286,8 @@ (define-public kodi
|
|||
(assoc-ref %build-inputs "libdvdnav-bootstrapped"))
|
||||
(string-append "-Dlibdvdcss_URL="
|
||||
(assoc-ref %build-inputs "libdvdcss-bootstrapped"))
|
||||
(string-append "-DSYSTEM_LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %build-inputs "curl") "/lib")
|
||||
"-DENABLE_NONFREE=OFF")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -331,10 +333,6 @@ (define-public kodi
|
|||
"TEST_F(TestSystemInfo, DISABLED_GetOsName)")
|
||||
(("TEST_F\\(TestSystemInfo, GetOsVersion\\)")
|
||||
"TEST_F(TestSystemInfo, DISABLED_GetOsVersion)"))
|
||||
;; FIXME: Why are these failing.
|
||||
(substitute* "xbmc/network/test/TestWebServer.cpp"
|
||||
(("TEST_F\\(TestWebServer, Can")
|
||||
"TEST_F(TestWebServer, DISABLED_Can"))
|
||||
#t))
|
||||
(add-before 'build 'set-build-environment
|
||||
(lambda _
|
||||
|
@ -344,14 +342,7 @@ (define-public kodi
|
|||
#t))
|
||||
(add-before 'check 'build-kodi-test
|
||||
(lambda _
|
||||
(zero? (system* "make" "kodi-test"))))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(curl (string-append (assoc-ref inputs "curl") "/lib")))
|
||||
(wrap-program (string-append out "/bin/kodi")
|
||||
`("LD_LIBRARY_PATH" suffix (,curl)))
|
||||
#t))))))
|
||||
(zero? (system* "make" "kodi-test")))))))
|
||||
;; TODO: Add dependencies for:
|
||||
;; - nfs
|
||||
;; - cec
|
||||
|
|
Loading…
Reference in a new issue