diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 17:18:57 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:32:37 +0200 |
| commit | 4951d2f386dc5da9569a0de14e9e98009af7b3d2 (patch) | |
| tree | 11771c4fed819d7809942c36072bab30f2567956 /gnu/packages/kodi.scm | |
| parent | 8c0117371a163240a487a6eee3d7992a9df327ea (diff) | |
| download | patches-4951d2f386dc5da9569a0de14e9e98009af7b3d2.tar patches-4951d2f386dc5da9569a0de14e9e98009af7b3d2.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/kodi.scm')
| -rw-r--r-- | gnu/packages/kodi.scm | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 4845c6624d..52e49a94f0 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -286,6 +286,8 @@ generator library for C++.") (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 @@ generator library for C++.") "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 @@ generator library for C++.") #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 |