From 3f9a09b808a812367fa997c63d7cc918458ef94e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 22 Feb 2026 04:49:18 +0100
Subject: [PATCH] various: fix pname misuse in buildRustApplication packages

after this all uses of 'inherit (finalAttrs) pname;' or 'finalAttrs.pname'
in these packages are in my opinion legit uses. e.g.:
- for inheriting the pname and version in fetchPnpmDeps, fetchCargoDeps or fetchCrate
- for use in creating the (p-)name of small sub-packages like tests or updateScripts.
- for cargoDepsName
- for buildAndTestSubdir
---
 pkgs/by-name/am/amdgpu_top/package.nix       | 2 +-
 pkgs/by-name/au/authoscope/package.nix       | 2 +-
 pkgs/by-name/br/browsers/package.nix         | 2 +-
 pkgs/by-name/ca/cargo-cyclonedx/package.nix  | 2 +-
 pkgs/by-name/en/engage/package.nix           | 4 ++--
 pkgs/by-name/fu/furtherance/package.nix      | 2 +-
 pkgs/by-name/ha/halloy/package.nix           | 2 +-
 pkgs/by-name/jf/jfmt/package.nix             | 2 +-
 pkgs/by-name/md/mdbook-katex/package.nix     | 2 +-
 pkgs/by-name/ne/nethoscope/package.nix       | 2 +-
 pkgs/by-name/rc/rclone-ui/package.nix        | 2 +-
 pkgs/by-name/sa/safe-rm/package.nix          | 2 +-
 pkgs/by-name/sh/shh/package.nix              | 6 +++---
 pkgs/by-name/si/similarity/package.nix       | 2 +-
 pkgs/by-name/sy/syndicate-server/package.nix | 2 +-
 pkgs/by-name/un/unpfs/package.nix            | 4 ++--
 pkgs/by-name/wl/wleave/package.nix           | 4 ++--
 17 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/am/amdgpu_top/package.nix b/pkgs/by-name/am/amdgpu_top/package.nix
index b56bfde91e81..cec01b1898d2 100644
--- a/pkgs/by-name/am/amdgpu_top/package.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   postFixup = ''
-    patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.pname}
+    patchelf --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" $out/bin/${finalAttrs.meta.mainProgram}
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix
index 33f69185e491..a03421e2278a 100644
--- a/pkgs/by-name/au/authoscope/package.nix
+++ b/pkgs/by-name/au/authoscope/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   postInstall = ''
-    installManPage docs/${finalAttrs.pname}.1
+    installManPage docs/authoscope.1
   '';
 
   # Tests requires access to httpin.org
diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix
index ad0227477728..d17f73efcb8d 100644
--- a/pkgs/by-name/br/browsers/package.nix
+++ b/pkgs/by-name/br/browsers/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mv $out/share/applications/software.Browsers.template.desktop $out/share/applications/software.Browsers.desktop
     substituteInPlace \
         $out/share/applications/software.Browsers.desktop \
-        --replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.pname} %u'
+        --replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.meta.mainProgram} %u'
     cp -r resources $out
     for size in 16 32 128 256 512; do
       install -m 444 \
diff --git a/pkgs/by-name/ca/cargo-cyclonedx/package.nix b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
index b0335bf0799d..94eb1dc807d4 100644
--- a/pkgs/by-name/ca/cargo-cyclonedx/package.nix
+++ b/pkgs/by-name/ca/cargo-cyclonedx/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-rust-cargo";
-    rev = "${finalAttrs.pname}-${finalAttrs.version}";
+    rev = "cargo-cyclonedx-${finalAttrs.version}";
     hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U=";
   };
 
diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix
index 2d57f8307c77..7c1fc1f965ae 100644
--- a/pkgs/by-name/en/engage/package.nix
+++ b/pkgs/by-name/en/engage/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   env = {
-    ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html";
+    ENGAGE_DOCS_LINK = "file://${placeholder "doc"}/share/doc/engage/index.html";
   };
 
   src = fetchFromGitLab {
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     ${lib.getExe mdbook} build
     mkdir -p "$doc/share/doc"
-    mv public "$doc/share/doc/${finalAttrs.pname}"
+    mv public "$doc/share/doc/engage"
   '';
 
   meta = {
diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix
index 88d16f3e5f46..40265eeddc54 100644
--- a/pkgs/by-name/fu/furtherance/package.nix
+++ b/pkgs/by-name/fu/furtherance/package.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-    patchelf $out/bin/${finalAttrs.pname} \
+    patchelf $out/bin/${finalAttrs.meta.mainProgram} \
       --add-rpath ${
         lib.makeLibraryPath [
           vulkan-loader
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 936a5aedb254..8d4932a0e1b7 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       desktopName = "Halloy";
       comment = "IRC client written in Rust";
       icon = "org.squidowl.halloy";
-      exec = finalAttrs.pname;
+      exec = finalAttrs.meta.mainProgram;
       terminal = false;
       mimeTypes = [
         "x-scheme-handler/irc"
diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix
index fdcc8ab9c69b..bfb31436d274 100644
--- a/pkgs/by-name/jf/jfmt/package.nix
+++ b/pkgs/by-name/jf/jfmt/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitHub {
     owner = "scruffystuffs";
-    repo = "${finalAttrs.pname}.rs";
+    repo = "jfmt.rs";
     rev = "v${finalAttrs.version}";
     hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80=";
   };
diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix
index 37d8826f09a5..d46f185af21a 100644
--- a/pkgs/by-name/md/mdbook-katex/package.nix
+++ b/pkgs/by-name/md/mdbook-katex/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time";
     mainProgram = "mdbook-katex";
-    homepage = "https://github.com/lzanini/${finalAttrs.pname}";
+    homepage = "https://github.com/lzanini/mdbook-katex";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       lovesegfault
diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix
index 8bc21edc41bd..0c88f51bc0d6 100644
--- a/pkgs/by-name/ne/nethoscope/package.nix
+++ b/pkgs/by-name/ne/nethoscope/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
   installCheckPhase = ''
-    if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.pname}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then
+    if [[ "$(${expect}/bin/unbuffer "$out/bin/${finalAttrs.meta.mainProgram}" --help 2> /dev/null | strings | grep ${finalAttrs.version} | tr -d '\n')" == " ${finalAttrs.version}" ]]; then
       echo '${finalAttrs.pname} smoke check passed'
     else
       echo '${finalAttrs.pname} smoke check failed'
diff --git a/pkgs/by-name/rc/rclone-ui/package.nix b/pkgs/by-name/rc/rclone-ui/package.nix
index 8fe408e1d7ce..b89245f10ba0 100644
--- a/pkgs/by-name/rc/rclone-ui/package.nix
+++ b/pkgs/by-name/rc/rclone-ui/package.nix
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src-tauri/tauri.conf.json \
-      --replace-fail '"mainBinaryName": "Rclone UI"' '"mainBinaryName": "${finalAttrs.pname}"'
+      --replace-fail '"mainBinaryName": "Rclone UI"' '"mainBinaryName": "${finalAttrs.meta.mainProgram}"'
     substituteInPlace src-tauri/Cargo.toml \
        --replace-fail 'name = "app"' 'name = "${finalAttrs.pname}"'
   '';
diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix
index aac13f960d2f..d82c0a55d48a 100644
--- a/pkgs/by-name/sa/safe-rm/package.nix
+++ b/pkgs/by-name/sa/safe-rm/package.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchgit {
     url = "https://git.launchpad.net/safe-rm";
-    tag = "${finalAttrs.pname}-${finalAttrs.version}";
+    tag = "safe-rm-${finalAttrs.version}";
     sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw=";
   };
 
diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index 8bfe3869fdf4..429634129b24 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -85,9 +85,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     installManPage target/mangen/*
 
-    installShellCompletion --cmd ${finalAttrs.pname} \
-      target/shellcomplete/${finalAttrs.pname}.{bash,fish} \
-      --zsh target/shellcomplete/_${finalAttrs.pname}
+    installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
+      target/shellcomplete/${finalAttrs.meta.mainProgram}.{bash,fish} \
+      --zsh target/shellcomplete/_${finalAttrs.meta.mainProgram}
   '';
 
   # RUST_BACKTRACE = 1;
diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix
index 7ee56ceacbf2..95d384534cb8 100644
--- a/pkgs/by-name/si/similarity/package.nix
+++ b/pkgs/by-name/si/similarity/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-7qLC1RvjBXd9JFrJdDTIngZhMvyQV1ko3MXRr/2y7hA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.pname}-ts";
+  versionCheckProgram = "${placeholder "out"}/bin/similarity-ts";
   doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix
index a865cef55339..31e17ac2e43f 100644
--- a/pkgs/by-name/sy/syndicate-server/package.nix
+++ b/pkgs/by-name/sy/syndicate-server/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     domain = "git.syndicate-lang.org";
     owner = "syndicate-lang";
     repo = "syndicate-rs";
-    rev = "${finalAttrs.pname}-v${finalAttrs.version}";
+    rev = "syndicate-server-v${finalAttrs.version}";
     hash = "sha256-orQN83DE+ZNgdx2PVcYrte/rVDFFtuQuRDKzeumpsLo=";
   };
 
diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix
index 81afb2c18d84..046848534e8a 100644
--- a/pkgs/by-name/un/unpfs/package.nix
+++ b/pkgs/by-name/un/unpfs/package.nix
@@ -22,8 +22,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env.RUSTC_BOOTSTRAP = 1;
 
   postInstall = ''
-    install -D -m 0444 ../../README* -t "$out/share/doc/${finalAttrs.pname}"
-    install -D -m 0444 ../../LICEN* -t "$out/share/doc/${finalAttrs.pname}"
+    install -D -m 0444 ../../README* -t "$out/share/doc/unpfs"
+    install -D -m 0444 ../../LICEN* -t "$out/share/doc/unpfs"
   '';
 
   meta = {
diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix
index 38b720e12d4f..e2dfe0dd73ec 100644
--- a/pkgs/by-name/wl/wleave/package.nix
+++ b/pkgs/by-name/wl/wleave/package.nix
@@ -49,10 +49,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/config.rs \
-      --replace-fail "/etc/wleave" "$out/etc/${finalAttrs.pname}"
+      --replace-fail "/etc/wleave" "$out/etc/wleave"
 
     substituteInPlace layout.json \
-      --replace-fail "/usr/share/wleave" "$out/share/${finalAttrs.pname}"
+      --replace-fail "/usr/share/wleave" "$out/share/wleave"
   '';
 
   postInstall = ''