discord: move to pkgs/by-name

pkgs/by-name/di/discord-canary/package.nix

@@ -0,0 +1,6 @@
+{
+  discord,
+  ...
+}@args:
+
+discord.override ({ pname = "discord-canary"; } // removeAttrs args [ "discord" ])

pkgs/by-name/di/discord-development/package.nix

@@ -0,0 +1,6 @@
+{
+  discord,
+  ...
+}@args:
+
+discord.override ({ pname = "discord-development"; } // removeAttrs args [ "discord" ])

pkgs/by-name/di/discord-ptb/package.nix

@@ -0,0 +1,6 @@
+{
+  discord,
+  ...
+}@args:
+
+discord.override ({ pname = "discord-ptb"; } // removeAttrs args [ "discord" ])

pkgs/by-name/di/discord/metadata.nix

@@ -1,5 +1,4 @@
 {
-  callPackage,
   lib,
   stdenv,
   discord,
@@ -95,13 +94,11 @@ lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ]
     platformName = if stdenv.hostPlatform.isDarwin then "osx" else "linux";
     source = sources."${platformName}-${args.branch}";
   in
-  callPackage ./wrapper.nix (
-    args
-    // {
-      inherit pname source;
-      meta = meta // {
-        mainProgram = args.binaryName;
-      };
-    }
-  )
+  args
+  // {
+    inherit source;
+    meta = meta // {
+      mainProgram = args.binaryName;
+    };
+  }
 )

pkgs/by-name/di/discord/package.nix

@@ -1,12 +1,6 @@
 {
   # Package metadata
-  pname,
-  source,
-  meta,
-  binaryName,
-  desktopName,
-  self,
-  branch,
+  pname ? "discord",
   # Feature flags (cross-platform)
   withOpenASAR ? false,
   withVencord ? false,
@@ -46,7 +40,17 @@
 let
   inherit (stdenv.hostPlatform) isLinux;
 
-  pkgArgs = removeAttrs args [
+  metadata = (callPackage ./metadata.nix { }).${pname};
+  inherit (metadata)
+    source
+    meta
+    binaryName
+    desktopName
+    self
+    branch
+    ;
+
+  pkgArgs = removeAttrs (args // metadata) [
     "branch"
     "self"
     "unwrappedDiscord"

pkgs/top-level/all-packages.nix

@@ -10673,13 +10673,6 @@ with pkgs;
 
   dartHooks = recurseIntoAttrs (callPackage ../build-support/dart/build-dart-application/hooks { });
 
-  inherit (callPackage ../applications/networking/instant-messengers/discord { })
-    discord
-    discord-ptb
-    discord-canary
-    discord-development
-    ;
-
   torcs-without-data = callPackage ../by-name/to/torcs/without-data.nix { };
 
   hy = with python3Packages; toPythonApplication hy;