From 606bfe729898d3733c24dbb42e0804d81da2fd03 Mon Sep 17 00:00:00 2001
From: Guanpeng Xu <herberteuler@gmail.com>
Date: Thu, 4 Jan 2024 00:54:46 -0800
Subject: [PATCH] yourkit-java: refactor

---
 .../tools/yourkit-java/default.nix            | 21 ++++++++++---------
 .../yourkit-java/forbid-desktop-item-creation |  7 +++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/yourkit-java/default.nix b/pkgs/development/tools/yourkit-java/default.nix
index f52b82059528..b60f0904de4f 100644
--- a/pkgs/development/tools/yourkit-java/default.nix
+++ b/pkgs/development/tools/yourkit-java/default.nix
@@ -14,23 +14,23 @@ let
             else if system == "aarch64=linux" then "arm64"
             else throw "Unsupported system";
 
+  version = "2023.9-b103";
+
   desktopItem = makeDesktopItem {
-    name = "Yourkit JavaProfiler";
-    exec = "yourkit-java-profiler";
-    comment = "Award winning, fully featured low overhead profiler for Java EE and Java SE platforms";
-    desktopName = "YourKit JavaProfiler";
     type = "Application";
+    name = "Yourkit Java Profiler " + version;
+    exec = "yourkit-java-profiler";
     icon = "yourkit-java-profiler";
+    categories = [ "Development" "Java" "Profiling" ];
     terminal = false;
-    categories = [ "Development" ];
-    startupWMClass = "yourkit-java-profiler";
-    startupNotify = false;
+    startupWMClass = "YourKit Java Profiler";
+    desktopName = "YourKit Java Profiler";
   };
 in
 stdenv.mkDerivation rec {
-  pname = "yourkit-java";
+  inherit version;
 
-  version = "2023.9-b103";
+  pname = "yourkit-java";
 
   src = fetchzip {
     url = "https://download.yourkit.com/yjp/${vPath version}/YourKit-JavaProfiler-${version}-${arch}.zip";
@@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
         $out/bin/yourkit-java-profiler
     # Use our desktop item, which will be purged when this package
     # gets removed
-    sed -i -e "2isource $out/bin/forbid-desktop-item-creation" \
+    sed -i -e "/^YD=/isource $out/bin/forbid-desktop-item-creation\\
+        " \
         $out/bin/yourkit-java-profiler
 
     runHook postInstall
diff --git a/pkgs/development/tools/yourkit-java/forbid-desktop-item-creation b/pkgs/development/tools/yourkit-java/forbid-desktop-item-creation
index 2c496d13f513..4b5ba60c606b 100644
--- a/pkgs/development/tools/yourkit-java/forbid-desktop-item-creation
+++ b/pkgs/development/tools/yourkit-java/forbid-desktop-item-creation
@@ -1,9 +1,8 @@
-CONFIG_DIR=$HOME/.yjp/config
-if [ ! -d $CONFIG_DIR ]; then
-    mkdir -p $CONFIG_DIR
+if [ ! -d $YS ]; then
+    mkdir -p $YS
 fi
 
-REGISTRY=$CONFIG_DIR/registry8.xml
+REGISTRY=$YS/registry8.xml
 if [ ! -e $REGISTRY ]; then
     cat >$REGISTRY <<EOF
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>