From ec938290b664392238ec5e666fbadb745fe476d2 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 18 Mar 2021 20:18:39 -0400 Subject: [PATCH] kodi.packages: minor code formatting/cleanup --- pkgs/applications/video/kodi-packages/joystick/default.nix | 4 ++-- .../video/kodi-packages/pvr-hdhomerun/default.nix | 4 ++-- pkgs/applications/video/kodi-packages/pvr-hts/default.nix | 1 - .../video/kodi-packages/pvr-iptvsimple/default.nix | 4 ++-- .../video/kodi-packages/steam-controller/default.nix | 1 - .../video/kodi-packages/vfs-libarchive/default.nix | 4 ++-- pkgs/applications/video/kodi-packages/vfs-sftp/default.nix | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/joystick/default.nix b/pkgs/applications/video/kodi-packages/joystick/default.nix index 7090811ecb0..a1b9c3eeeef 100644 --- a/pkgs/applications/video/kodi-packages/joystick/default.nix +++ b/pkgs/applications/video/kodi-packages/joystick/default.nix @@ -11,12 +11,12 @@ buildKodiBinaryAddon rec { sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914"; }; + extraBuildInputs = [ tinyxml udev ]; + meta = with lib; { description = "Binary addon for raw joystick input."; platforms = platforms.all; license = licenses.gpl2Only; maintainers = teams.kodi.members; }; - - extraBuildInputs = [ tinyxml udev ]; } diff --git a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix index 53b30af145a..ba1a0241ffe 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix @@ -11,6 +11,8 @@ buildKodiBinaryAddon rec { sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm"; }; + extraBuildInputs = [ jsoncpp libhdhomerun ]; + meta = with lib; { homepage = "https://github.com/kodi-pvr/pvr.hdhomerun"; description = "Kodi's HDHomeRun PVR client addon"; @@ -18,6 +20,4 @@ buildKodiBinaryAddon rec { license = licenses.gpl2Only; maintainers = teams.kodi.members; }; - - extraBuildInputs = [ jsoncpp libhdhomerun ]; } diff --git a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix index d557b97c918..5c55873e819 100644 --- a/pkgs/applications/video/kodi-packages/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-hts/default.nix @@ -18,5 +18,4 @@ buildKodiBinaryAddon rec { license = licenses.gpl2Only; maintainers = teams.kodi.members; }; - } diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index 6ede3097f9a..9f160b4fa61 100644 --- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -11,6 +11,8 @@ buildKodiBinaryAddon rec { sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr"; }; + extraBuildInputs = [ zlib pugixml ]; + meta = with lib; { homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; description = "Kodi's IPTV Simple client addon"; @@ -18,6 +20,4 @@ buildKodiBinaryAddon rec { license = licenses.gpl2Plus; maintainers = teams.kodi.members; }; - - extraBuildInputs = [ zlib pugixml ]; } diff --git a/pkgs/applications/video/kodi-packages/steam-controller/default.nix b/pkgs/applications/video/kodi-packages/steam-controller/default.nix index a6a969ce86d..d2b79029f7c 100644 --- a/pkgs/applications/video/kodi-packages/steam-controller/default.nix +++ b/pkgs/applications/video/kodi-packages/steam-controller/default.nix @@ -18,5 +18,4 @@ buildKodiBinaryAddon rec { platforms = platforms.all; maintainers = teams.kodi.members; }; - } diff --git a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix index 78dab5c981f..6819f7bfdcb 100644 --- a/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix +++ b/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix @@ -11,12 +11,12 @@ buildKodiBinaryAddon rec { sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; }; + extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; + meta = with lib; { description = "LibArchive Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = teams.kodi.members; }; - - extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; } diff --git a/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix index 112a0b9d65e..e41f008281a 100644 --- a/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix +++ b/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix @@ -11,12 +11,12 @@ buildKodiBinaryAddon rec { sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk"; }; + extraBuildInputs = [ openssl libssh zlib ]; + meta = with lib; { description = "SFTP Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = teams.kodi.members; }; - - extraBuildInputs = [ openssl libssh zlib ]; }