jetbrains

rG2ee · May 18, 2024 · 58dd7ee · 58dd7ee
1 parent 43d2284
commit 58dd7ee
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/jetbrains-client/Dockerfile b/pkgs/jetbrains-client/Dockerfile
@@ -1,7 +1,6 @@
 # fix a specific version for reproducability
 FROM debian:bookworm-20230919
 
-
 RUN apt-get update && apt-get install -y \
     sudo curl wget bash vim htop tree fontconfig libfreetype6 \
     libxext6 libxrender1 libxtst6 libfreetype6 libxi6
@@ -33,8 +32,8 @@ RUN rm -rf jetbrains-clients-downloader-linux-x86_64-1867* backends
 ################################ Apply the neo2-awk-hack ##################################
 ############################################################################################
 
-COPY ./apply_neo2_awk_hack.sh /app/apply_neo2_awk_hack.sh
-RUN /app/apply_neo2_awk_hack.sh
-RUN rm apply_neo2_awk_hack.sh
+# COPY ./apply_neo2_awk_hack.sh /app/apply_neo2_awk_hack.sh
+# RUN /app/apply_neo2_awk_hack.sh
+# RUN rm /app/apply_neo2_awk_hack.sh
 
 ENTRYPOINT ["/app/idea-IU-233.13135.103/bin/jetbrains_client.sh"]
diff --git a/pkgs/jetbrains-client/apply_neo2_awk_hack.sh b/pkgs/jetbrains-client/apply_neo2_awk_hack.sh
@@ -2,12 +2,12 @@
 
 
 IDEA_PATH="/app/idea-IU-233.13135.103"
-EXECUTABLES=("jetbrains_client" "idea")
+EXECUTABLES=("jetbrains_client")  # "idea")
 
 
 mkdir /home/user/.ideaNeo
 wget -O /home/user/.ideaNeo/neo2-awt-hack-0.5.jar "https://github.com/chenkelmann/neo2-awt-hack/blob/master/releases/neo2-awt-hack-0.5-java8oracle.jar?raw=true"
-echo "sha256-/2OGd2Nl7tRqkB73LJjLXMlRwFHwOdX9cnXRk5BP3S8=  neo2-awt-hack-0.5.jar" | sha256sum -c
+# echo "sha256 -/2OGd2Nl7tRqkB73LJjLXMlRwFHwOdX9cnXRk5BP3S8=  neo2-awt-hack-0.5.jar" | sha256sum -c
 
 
 for EXECUTABLE in "${EXECUTABLES[@]}"; do
@@ -24,5 +24,5 @@ for EXECUTABLE in "${EXECUTABLES[@]}"; do
     cat temp_last_lines.txt >> "$IDEA_PATH/bin/$EXECUTABLE.sh"
 
     # cleanup
-    rm temp_last_lines.txt
+    # rm temp_last_lines.txt
 done
diff --git a/pkgs/jetbrains-override-neo2.nix b/pkgs/jetbrains-override-neo2.nix
@@ -1,4 +1,4 @@
-{ fetchurl, jetbrains }:
+{ fetchurl, jetbrains, lib }:
 
 let
   neo2AwtHackJar = fetchurl {
@@ -32,5 +32,14 @@ in
 
 {
   idea-ultimate = jetbrains.idea-ultimate.overrideAttrs (overrideFn "idea-ultimate" "idea");
-  clion = jetbrains.clion.overrideAttrs (overrideFn "clion" "clion");
+  # clion = jetbrains.clion.overrideAttrs (overrideFn "clion" "clion");
+
+
+  clion = let
+      clionWithNeo2AwtHack = jetbrains.clion.overrideAttrs (overrideFn "clion" "clion");
+    in lib.overrideDerivation clionWithNeo2AwtHack (oldAttrs: {
+      buildInputs = oldAttrs.buildInputs or [ ] ++ [ (jetbrains.plugins.addPlugins jetbrains.clion [
+      # "github-copilot"
+      ]) ];
+    });
 }