From 8bcd7304ff403e0cb3d122a3379aab022592458a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Mar 2026 08:51:01 -0600
Subject: [PATCH 1/2] bcompare: migrate to by-name

---
 .../default.nix => by-name/bc/bcompare/package.nix} | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{applications/version-management/bcompare/default.nix => by-name/bc/bcompare/package.nix} (96%)

diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/by-name/bc/bcompare/package.nix
similarity index 96%
rename from pkgs/applications/version-management/bcompare/default.nix
rename to pkgs/by-name/bc/bcompare/package.nix
index fe357ff001c0..322e8be653c5 100644
--- a/pkgs/applications/version-management/bcompare/default.nix
+++ b/pkgs/by-name/bc/bcompare/package.nix
@@ -8,10 +8,7 @@
   glibc,
   pango,
   gtk2,
-  kcoreaddons,
-  ki18n,
-  kio,
-  kservice,
+  libsForQt5,
   stdenv,
   runtimeShell,
   unzip,
@@ -75,10 +72,10 @@ let
       gtk2
       pango
       cairo
-      kio
-      kservice
-      ki18n
-      kcoreaddons
+      libsForQt5.kio
+      libsForQt5.kservice
+      libsForQt5.ki18n
+      libsForQt5.kcoreaddons
       gdk-pixbuf
       bzip2
     ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7dd32a0c162..b0c07cda898d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12495,8 +12495,6 @@ with pkgs;
 
   openbsd = callPackage ../os-specific/bsd/openbsd { };
 
-  bcompare = libsForQt5.callPackage ../applications/version-management/bcompare { };
-
   xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver;
 
   radicle-node-unstable = callPackage ../by-name/ra/radicle-node/unstable.nix { };

From c132fbffa4b97dfb904e7157b0de383c9c27543c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 3 Mar 2026 08:53:31 -0600
Subject: [PATCH 2/2] bcompare: hardcode pname

---
 pkgs/by-name/bc/bcompare/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix
index 322e8be653c5..e0a0729bd9f8 100644
--- a/pkgs/by-name/bc/bcompare/package.nix
+++ b/pkgs/by-name/bc/bcompare/package.nix
@@ -22,7 +22,7 @@ let
 
   srcs = {
     x86_64-linux = fetchurl {
-      url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
+      url = "https://www.scootersoftware.com/bcompare-${version}_amd64.deb";
       sha256 = "sha256-4AWTSoYpVhGmBBxcwHXdg1CGd/04+8yL9pu+gHrsj6U";
     };
 
@@ -56,7 +56,7 @@ let
       # Remove library that refuses to be autoPatchelf'ed
       rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
 
-      substituteInPlace $out/bin/${pname} \
+      substituteInPlace $out/bin/bcompare \
         --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
         --replace "ldd" "${glibc.bin}/bin/ldd" \
         --replace "/bin/bash" "${runtimeShell}"