jetbrains.*: switch binary IDEs to use jdk-no-jcef

pkgs/applications/editors/jetbrains/default.nix

@@ -5,18 +5,28 @@
   callPackage,
 
   python3,
+  jetbrains,
 
-  jdk,
   vmopts ? null,
   forceWayland ? false,
 }:
 
 let
-  mkJetBrainsProduct = callPackage ./builder/default.nix { inherit jdk forceWayland vmopts; };
-  mkJetBrainsSource = callPackage ./source/build.nix { };
+  jetbrainsBuilder =
+    jdk:
+    callPackage ./builder/default.nix {
+      inherit jdk forceWayland vmopts;
+    };
 
   mkSrcIde =
-    path: extras: callPackage path ({ inherit mkJetBrainsProduct mkJetBrainsSource; } // extras);
+    path: extras:
+    callPackage path (
+      {
+        mkJetBrainsProduct = jetbrainsBuilder jetbrains.jdk;
+        mkJetBrainsSource = callPackage ./source/build.nix { };
+      }
+      // extras
+    );
 
   _idea-oss = mkSrcIde ./ides/idea-oss.nix { };
 
@@ -25,7 +35,7 @@ let
     path: extras:
     callPackage path (
       {
-        inherit mkJetBrainsProduct;
+        mkJetBrainsProduct = jetbrainsBuilder jetbrains.jdk-no-jcef;
         libdbm = _idea-oss.libdbm;
         fsnotifier = _idea-oss.fsnotifier;
       }

pkgs/top-level/all-packages.nix

@@ -8756,7 +8756,6 @@ with pkgs;
     recurseIntoAttrs (
       callPackages ../applications/editors/jetbrains {
         vmopts = config.jetbrains.vmopts or null;
-        jdk = jetbrains.jdk;
       }
     )
     // {