From 522a0dcc7f19f2a91549980803c4bd7937fb9f32 Mon Sep 17 00:00:00 2001
From: barsikus007 <barsikus07@gmail.com>
Date: Wed, 6 May 2026 12:19:32 +0300
Subject: [PATCH 1/2] bcompare: add SMB drive mounting support via python3 +
 pygobject3

Patch bcmount.sh to use python3 with pygobject3 so that mounting SMB
drives works. Add wrapGAppsHook3 and gobject-introspection to
nativeBuildInputs accordingly.
---
 pkgs/by-name/bc/bcompare/package.nix | 97 +++++++++++++++++-----------
 1 file changed, 58 insertions(+), 39 deletions(-)

diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix
index 234f66ac031e..a55448023ecc 100644
--- a/pkgs/by-name/bc/bcompare/package.nix
+++ b/pkgs/by-name/bc/bcompare/package.nix
@@ -4,10 +4,13 @@
   bzip2,
   fetchurl,
   glibc,
+  gobject-introspection,
   kdePackages,
+  python3,
   stdenv,
   runtimeShell,
   unzip,
+  wrapGAppsHook3,
 }:
 
 let
@@ -32,53 +35,68 @@ let
 
   src = srcs.${stdenv.hostPlatform.system} or throwSystem;
 
-  linux = stdenv.mkDerivation {
-    inherit
-      pname
-      version
-      src
-      meta
-      ;
-    unpackPhase = ''
-      ar x $src
-      tar xfz data.tar.gz
-    '';
+  linux =
+    let
+      python = python3.withPackages (
+        pp: with pp; [
+          pygobject3
+        ]
+      );
+    in
+    stdenv.mkDerivation {
+      inherit
+        pname
+        version
+        src
+        meta
+        ;
+      unpackPhase = ''
+        ar x $src
+        tar xfz data.tar.gz
+      '';
 
-    installPhase = ''
-      mkdir -p $out/{bin,lib,share}
+      installPhase = ''
+        mkdir -p $out/{bin,lib,share}
 
-      cp -R usr/{bin,lib,share} $out/
+        cp -R usr/{bin,lib,share} $out/
 
-      # Remove library that refuses to be autoPatchelf'ed
-      #  - bcompare_ext_kde.amd64.so is linked with Qt4
-      #  - bcompare_ext_kde5.amd64.so is linked with Qt5
-      rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
-      rm $out/lib/beyondcompare/ext/bcompare_ext_kde5.amd64.so
+        # Remove library that refuses to be autoPatchelf'ed
+        #  - bcompare_ext_kde.amd64.so is linked with Qt4
+        #  - bcompare_ext_kde5.amd64.so is linked with Qt5
+        rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so
+        rm $out/lib/beyondcompare/ext/bcompare_ext_kde5.amd64.so
 
-      substituteInPlace $out/bin/bcompare \
-        --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
-        --replace "ldd" "${glibc.bin}/bin/ldd" \
-        --replace "/bin/bash" "${runtimeShell}"
-    '';
+        substituteInPlace $out/bin/bcompare \
+          --replace-fail "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \
+          --replace-fail "ldd" "${glibc.bin}/bin/ldd" \
+          --replace-fail "/bin/bash" "${runtimeShell}"
 
-    nativeBuildInputs = [ autoPatchelfHook ];
+        substituteInPlace $out/lib/beyondcompare/bcmount.sh \
+          --replace-fail "python3" "${python.interpreter}"
+      '';
 
-    buildInputs = [
-      (lib.getLib stdenv.cc.cc)
-      kdePackages.kio
-      kdePackages.kservice
-      kdePackages.ki18n
-      kdePackages.kcoreaddons
-      bzip2
-    ];
+      nativeBuildInputs = [
+        autoPatchelfHook
+        gobject-introspection
+        wrapGAppsHook3
+      ];
 
-    dontBuild = true;
-    dontConfigure = true;
-    dontWrapQtApps = true;
+      buildInputs = [
+        (lib.getLib stdenv.cc.cc)
+        kdePackages.kio
+        kdePackages.kservice
+        kdePackages.ki18n
+        kdePackages.kcoreaddons
+        bzip2
+      ];
 
-    __structuredAttrs = true;
-    strictDeps = true;
-  };
+      dontBuild = true;
+      dontConfigure = true;
+      dontWrapQtApps = true;
+
+      __structuredAttrs = true;
+      strictDeps = true;
+    };
 
   darwin = stdenv.mkDerivation {
     inherit
@@ -111,6 +129,7 @@ let
     maintainers = with lib.maintainers; [
       ktor
       arkivm
+      barsikus007
     ];
     platforms = builtins.attrNames srcs;
     mainProgram = "bcompare";

From 4df5805b13bae7e6511e837b817a5c002d5e8f72 Mon Sep 17 00:00:00 2001
From: barsikus007 <barsikus07@gmail.com>
Date: Tue, 16 Dec 2025 22:01:52 +0300
Subject: [PATCH 2/2] maintainers: add barsikus007

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aba8224e06af..f7708e176131 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3101,6 +3101,12 @@
     githubId = 75235;
     name = "Michael Walker";
   };
+  barsikus007 = {
+    name = "barsikus007";
+    email = "barsikus07@gmail.com";
+    github = "barsikus007";
+    githubId = 37113583;
+  };
   bartoostveen = {
     name = "Bart Oostveen";
     github = "bartoostveen";