diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix
index 4ab8da344c09..2eb9c202360f 100644
--- a/pkgs/by-name/gn/gnome-panel/package.nix
+++ b/pkgs/by-name/gn/gnome-panel/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-panel";
-  version = "3.56.0";
+  version = "3.58.1";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-UoptZ92E7a5sgKXuZW+E+9lC87Nx1g+XottgZc9P0XA=";
+    hash = "sha256-fovKQ6gaE0xmazp4uvKv+wxdMO+xvKZTiH/EGzHdXmQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix
index 30f9c1823857..0d7fb34e4772 100644
--- a/pkgs/by-name/gn/gnome-panel/wrapper.nix
+++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
   dontUnpack = true;
   dontConfigure = true;
   dontBuild = true;
+  # $output/lib/systemd/user is already a symlink
+  dontMoveSystemdUserUnits = true;
 
   preferLocalBuild = true;
   allowSubstitutes = false;
@@ -52,10 +54,10 @@ stdenv.mkDerivation {
     rm -r $out/lib/gnome-panel/modules
     ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out
 
-    rm $out/share/applications/gnome-panel.desktop
-
-    ln -s ${gnome-panel}/share/applications/gnome-panel.desktop \
-      $out/share/applications/gnome-panel.desktop
+    rm $out/share/systemd/user/gnome-panel.service
+    substitute ${gnome-panel}/share/systemd/user/gnome-panel.service \
+      $out/share/systemd/user/gnome-panel.service \
+      --replace-fail "ExecStart=${gnome-panel}/bin/gnome-panel" "ExecStart=$out/bin/gnome-panel"
 
     runHook postInstall
   '';