From 9c4a68e3aa5dc9ab9dbcf63b6fe8e721ed793b3c Mon Sep 17 00:00:00 2001
From: xeals <dev@xeal.me>
Date: Sun, 18 Oct 2020 18:06:49 +1100
Subject: [PATCH] jetbrains: add plugins to passthrough

---
 default.nix                                     | 4 ++--
 pkgs/applications/editors/jetbrains/wrapper.nix | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index 09b0ba5..746c064 100644
--- a/default.nix
+++ b/default.nix
@@ -63,7 +63,7 @@ rec {
   };
 
   # A functional Jetbrains IDE-with-plugins package set.
-  jetbrains = (pkgs.dontRecurseIntoAttrs rec {
+  jetbrains = pkgs.dontRecurseIntoAttrs rec {
     jetbrainsPluginsFor = variant: import ./pkgs/top-level/jetbrains-plugins.nix {
       inherit (pkgs) lib newScope stdenv fetchzip;
       inherit variant;
@@ -80,7 +80,7 @@ rec {
     clionWithPlugins = clionPlugins.jetbrainsWithPlugins;
     ideaCommunityWithPlugins = ideaCommunityPlugins.jetbrainsWithPlugins;
     ideaUltimateWithPlugins = ideaUltimatePlugins.jetbrainsWithPlugins;
-  });
+  };
 
   libhl = pkgs.callPackage ./pkgs/development/libraries/libhl { };
 
diff --git a/pkgs/applications/editors/jetbrains/wrapper.nix b/pkgs/applications/editors/jetbrains/wrapper.nix
index 7ce5be7..fa59585 100644
--- a/pkgs/applications/editors/jetbrains/wrapper.nix
+++ b/pkgs/applications/editors/jetbrains/wrapper.nix
@@ -21,7 +21,8 @@ in
 assert assertMsg (length badPlugins == 0) errorMsg;
 
 appendToName "with-plugins" (package.overrideAttrs (oldAttrs: {
-  inherit plugins;
+  passthru = { inherit plugins; };
+  # TODO: Purely aesthetics, but link the plugin to its name instead of hash-name-version
   installPhase = oldAttrs.installPhase + ''
     for plugin in $plugins; do
       ln -s "$plugin" "$out/$name/plugins/$(basename $plugin)"