kodi: introduce kodi.withPackages to replace kodiPackages.kodiWithAddons

2 files changed, 16 insertions, 9 deletions

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
new file mode 100644
index 0000000000000..55ba84cc454c1
--- /dev/null
+++ b/pkgs/applications/video/kodi/default.nix
@@ -0,0 +1,14 @@
+{ callPackage, ... } @ args:
+let
+  unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]);
+  kodiPackages = callPackage ./packages.nix { kodi = unwrapped; };
+in
+  unwrapped.overrideAttrs (oldAttrs: {
+    passthru = oldAttrs.passthru // {
+      packages = kodiPackages;
+      withPackages = func: callPackage ./wrapper.nix {
+        kodi = unwrapped;
+        addons = kodiPackages.requiredKodiAddons (func kodiPackages);
+      };
+    };
+  })
diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index d4844703b6b88..2b4abbb500aff 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,9 +1,7 @@
 { lib, makeWrapper, buildEnv, kodi, addons }:
 
-let
-  drvName = builtins.parseDrvName kodi.name;
-in buildEnv {
-  name = "${drvName.name}-with-addons-${drvName.version}";
+buildEnv {
+  name = "${kodi.name}-env";
 
   paths = [ kodi ] ++ addons;
   pathsToLink = [ "/share" ];
@@ -22,9 +20,4 @@ in buildEnv {
             (plugin: plugin.extraRuntimeDependencies or []) addons)}"
     done
   '';
-
-  meta = kodi.meta // {
-    description = kodi.meta.description
-                + " (with addons: ${lib.concatMapStringsSep ", " (x: x.name) addons})";
-  };
 }