diff options
author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2019-08-28 11:07:32 +0000 |
commit | 08f68313a47a2093dc0f408a706b2c125bc59c95 (patch) | |
tree | bb48188c0bf9fac152c038426146df518ef8c562 /pkgs/applications/video/kodi | |
parent | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff) |
treewide: remove redundant rec
Diffstat (limited to 'pkgs/applications/video/kodi')
-rw-r--r-- | pkgs/applications/video/kodi/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/kodi/plugins.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 73bcdadbc5948..f022722584cda 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -143,7 +143,7 @@ let postPatch = cmakeProtoPatch; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; src = kodi_src; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 7bb905fecd86a..dad52ccb9a7c6 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -51,7 +51,7 @@ let self = rec { }; mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: - toKodiPlugin (stdenv.mkDerivation (rec { + toKodiPlugin (stdenv.mkDerivation ({ name = "kodi-plugin-${plugin}-${version}"; dontStrip = true; @@ -70,7 +70,7 @@ let self = rec { mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], extraRuntimeDependencies ? [], extraInstallPhase ? "", ... }@args: - toKodiPlugin (stdenv.mkDerivation (rec { + toKodiPlugin (stdenv.mkDerivation ({ name = "kodi-plugin-${plugin}-${version}"; dontStrip = true; @@ -310,7 +310,7 @@ let self = rec { }; - steam-launcher = mkKodiPlugin rec { + steam-launcher = mkKodiPlugin { plugin = "steam-launcher"; namespace = "script.steam.launcher"; |