nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Marius Bakke 2017-03-30 17:18:57 +02:00
parent 8c0117371a
commit 4951d2f386
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/kodi.scm
View File

@ -286,6 +286,8 @@ generator library for C++.")
(assoc-ref %build-inputs "libdvdnav-bootstrapped")) (assoc-ref %build-inputs "libdvdnav-bootstrapped"))
(string-append "-Dlibdvdcss_URL=" (string-append "-Dlibdvdcss_URL="
(assoc-ref %build-inputs "libdvdcss-bootstrapped")) (assoc-ref %build-inputs "libdvdcss-bootstrapped"))
(string-append "-DSYSTEM_LDFLAGS=-Wl,-rpath="
(assoc-ref %build-inputs "curl") "/lib")
"-DENABLE_NONFREE=OFF") "-DENABLE_NONFREE=OFF")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -331,10 +333,6 @@ generator library for C++.")
"TEST_F(TestSystemInfo, DISABLED_GetOsName)") "TEST_F(TestSystemInfo, DISABLED_GetOsName)")
(("TEST_F\\(TestSystemInfo, GetOsVersion\\)") (("TEST_F\\(TestSystemInfo, GetOsVersion\\)")
"TEST_F(TestSystemInfo, DISABLED_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)) #t))
(add-before 'build 'set-build-environment (add-before 'build 'set-build-environment
(lambda _ (lambda _
@ -344,14 +342,7 @@ generator library for C++.")
#t)) #t))
(add-before 'check 'build-kodi-test (add-before 'check 'build-kodi-test
(lambda _ (lambda _
(zero? (system* "make" "kodi-test")))) (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))))))
;; TODO: Add dependencies for: ;; TODO: Add dependencies for:
;; - nfs ;; - nfs
;; - cec ;; - cec