07/08: gnu: kodi: Remove silly wrapper script.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 4951d2f386dc5da9569a0de14e9e98009af7b3d2
Author: Marius Bakke <address@hidden>
Date:   Thu Mar 30 17:18:57 2017 +0200

    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.
---
 gnu/packages/kodi.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 4845c66..52e49a9 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