diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-12-13 16:29:21 -0500 |
| commit | 6dffced09ecda024e0884e352778c221ad066fd6 (patch) | |
| tree | 1707e8d8df4d9c47317a39ab6abbfc2ca66a6c29 /gnu/packages/kodi.scm | |
| parent | b603554ed044638dd40b6863d5dada59eefe03b8 (diff) | |
| parent | e3196755e60ba7f1ed9d432e73f26a85e0c8893c (diff) | |
Merge branch 'core-updates-frozen' into 'master'.
At last!
Diffstat (limited to 'gnu/packages/kodi.scm')
| -rw-r--r-- | gnu/packages/kodi.scm | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 1e50624696..fc8c5b124e 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -257,10 +257,8 @@ generator library for C++.") (arguments '(#:configure-flags '("SH=sh"))) (native-inputs - `(("ghostscript" ,ghostscript) ; ps2pdf - ("groff" ,groff) - ("libtool" ,libtool) - ("which" ,which))) + (list ghostscript ; ps2pdf + groff libtool which)) (synopsis "fuzzy comparison of strings") (description "The fstrcmp project provides a library that is used to make fuzzy @@ -349,8 +347,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (substitute* "xbmc/platform/linux/LinuxTimezone.cpp" (("/usr/share/zoneinfo") - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo"))) + (search-input-directory inputs "share/zoneinfo"))) ;; Don't phone home to check for updates. (substitute* "system/addon-manifest.xml" @@ -500,9 +497,7 @@ plug-in system.") (file-name (string-append name "-" version "-checkout")))) (build-system trivial-build-system) (inputs - `(("bash" ,bash) - ("curl" ,curl) - ("mps-youtube" ,mps-youtube))) + (list bash curl mps-youtube)) (arguments `(#:modules ((guix build utils)) #:builder @@ -510,8 +505,8 @@ plug-in system.") (use-modules (guix build utils)) (copy-recursively (assoc-ref %build-inputs "source") ".") (substitute* "kodi-cli" - (("/bin/bash") (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) + (("/bin/bash") + (search-input-file %build-inputs "/bin/bash")) (("output=\\$\\((curl)" all curl) (string-append "output=$(" (assoc-ref %build-inputs "curl") |