From 07d1e51694445620464acbf6caece8eafc0ba560 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 17 Sep 2025 23:51:48 +0800
Subject: [PATCH 1/2] staruml: 6.3.4 -> 7.0.0

---
 pkgs/by-name/st/staruml/package.nix | 86 +++++++++++++++--------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix
index c2ebe9fc8f34..69c661228528 100644
--- a/pkgs/by-name/st/staruml/package.nix
+++ b/pkgs/by-name/st/staruml/package.nix
@@ -24,48 +24,17 @@
   at-spi2-core,
   cups,
   libxkbcommon,
+  bintools,
+  libGL,
 }:
 
-let
-  LD_LIBRARY_PATH = lib.makeLibraryPath [
-    glib
-    gtk3
-    xorg.libXdamage
-    xorg.libX11
-    xorg.libxcb
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libxshmfence
-    libxkbcommon
-    nss
-    nspr
-    atk
-    at-spi2-atk
-    dbus
-    gdk-pixbuf
-    pango
-    cairo
-    xorg.libXrandr
-    expat
-    libdrm
-    libgbm
-    alsa-lib
-    at-spi2-core
-    cups
-  ];
-in
 stdenv.mkDerivation (finalAttrs: {
-  version = "6.3.4";
+  version = "7.0.0";
   pname = "staruml";
 
   src = fetchurl {
-    url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-Qo5hBdVl/pDBkfBYhNF31P3Tii/V6Iczc7BOvagxjxE=";
+    url = "https://files.staruml.io/releases-v7/StarUML_${finalAttrs.version}_amd64.deb";
+    hash = "sha256-z25qeE2G9F010IE1WFxwIifYqowjB4dpUDgRg38RtQc=";
   };
 
   nativeBuildInputs = [
@@ -78,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     mv opt $out
 
@@ -85,22 +56,55 @@ stdenv.mkDerivation (finalAttrs: {
     rm -rf $out/share/doc
 
     substituteInPlace $out/share/applications/staruml.desktop \
-      --replace "/opt/StarUML/staruml" "$out/bin/staruml"
+      --replace-fail "/opt/StarUML/staruml" "$out/bin/staruml"
 
     mkdir -p $out/lib
     ln -s ${lib.getLib stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
     ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
-    patchelf \
-      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $out/opt/StarUML/staruml
+    patchelf --interpreter ${bintools.dynamicLinker} --add-needed libGL.so.1 $out/opt/StarUML/staruml
 
     ln -s $out/opt/StarUML/staruml $out/bin/staruml
+
+    runHook postInstall
   '';
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix LD_LIBRARY_PATH ':' $out/lib:${LD_LIBRARY_PATH}
+      --prefix LD_LIBRARY_PATH : $out/lib:${
+        lib.makeLibraryPath [
+          glib
+          gtk3
+          xorg.libXdamage
+          xorg.libX11
+          xorg.libxcb
+          xorg.libXcomposite
+          xorg.libXcursor
+          xorg.libXext
+          xorg.libXfixes
+          xorg.libXi
+          xorg.libXrender
+          xorg.libXtst
+          xorg.libxshmfence
+          libxkbcommon
+          nss
+          nspr
+          atk
+          at-spi2-atk
+          dbus
+          gdk-pixbuf
+          pango
+          cairo
+          xorg.libXrandr
+          expat
+          libdrm
+          libgbm
+          alsa-lib
+          at-spi2-core
+          cups
+          libGL
+        ]
+      }
     )
   '';
 

From c6ad3bad2ebd0c0f21908a03cc144942bc6222d1 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Wed, 17 Sep 2025 23:52:24 +0800
Subject: [PATCH 2/2] staruml: remove with lib

---
 pkgs/by-name/st/staruml/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix
index 69c661228528..8bcfe77a47fa 100644
--- a/pkgs/by-name/st/staruml/package.nix
+++ b/pkgs/by-name/st/staruml/package.nix
@@ -108,12 +108,12 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Sophisticated software modeler";
     homepage = "https://staruml.io/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [ kashw2 ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ kashw2 ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "staruml";
   };