From 904070f0ada9a3a89d7e18ce0a71c86abefa82ef Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 25 Nov 2024 19:23:38 +0800
Subject: [PATCH 1/3] cobang: move to by-name

---
 .../misc/cobang/default.nix => by-name/co/cobang/package.nix} | 3 +--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)
 rename pkgs/{applications/misc/cobang/default.nix => by-name/co/cobang/package.nix} (97%)

diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/by-name/co/cobang/package.nix
similarity index 97%
rename from pkgs/applications/misc/cobang/default.nix
rename to pkgs/by-name/co/cobang/package.nix
index e20bf9b818ad..4d2cf6e40c34 100644
--- a/pkgs/applications/misc/cobang/default.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -11,7 +11,6 @@
 , requests
 , single-version
 , gobject-introspection
-, gst-plugins-good
 , gtk3
 , libhandy
 , librsvg
@@ -49,7 +48,7 @@ buildPythonApplication rec {
 
   buildInputs = [
     # Requires v4l2src
-    gst-plugins-good
+   (gst_all_1.gst-plugins-good.override { gtkSupport = true; });
     # For gobject namespaces
     libhandy
     networkmanager
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 882196e53a13..e63f3bcc50a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3047,10 +3047,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  cobang = python311Packages.callPackage ../applications/misc/cobang {
-    gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
-  };
-
   cocoapods = callPackage ../development/tools/cocoapods { };
 
   cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; });

From 86476b482968df3e91933dc61d21fbb923a827f3 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 25 Nov 2024 19:26:39 +0800
Subject: [PATCH 2/3] cobang: nixfmt

---
 pkgs/by-name/co/cobang/package.nix | 50 ++++++++++++++++--------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix
index 4d2cf6e40c34..16c06bfbf31c 100644
--- a/pkgs/by-name/co/cobang/package.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -1,24 +1,25 @@
-{ lib
-, buildPythonApplication
-, fetchFromGitHub
-, brotlicffi
-, gst-python
-, kiss-headers
-, logbook
-, pillow
-, pygobject3
-, python-zbar
-, requests
-, single-version
-, gobject-introspection
-, gtk3
-, libhandy
-, librsvg
-, networkmanager
-, setuptools
-, python
-, pytestCheckHook
-, wrapGAppsHook3
+{
+  lib,
+  buildPythonApplication,
+  fetchFromGitHub,
+  brotlicffi,
+  gst-python,
+  kiss-headers,
+  logbook,
+  pillow,
+  pygobject3,
+  python-zbar,
+  requests,
+  single-version,
+  gobject-introspection,
+  gtk3,
+  libhandy,
+  librsvg,
+  networkmanager,
+  setuptools,
+  python,
+  pytestCheckHook,
+  wrapGAppsHook3,
 }:
 
 buildPythonApplication rec {
@@ -48,7 +49,7 @@ buildPythonApplication rec {
 
   buildInputs = [
     # Requires v4l2src
-   (gst_all_1.gst-plugins-good.override { gtkSupport = true; });
+    (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
     # For gobject namespaces
     libhandy
     networkmanager
@@ -96,7 +97,10 @@ buildPythonApplication rec {
     description = "QR code scanner desktop app for Linux";
     homepage = "https://github.com/hongquan/CoBang";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ aleksana dvaerum ];
+    maintainers = with maintainers; [
+      aleksana
+      dvaerum
+    ];
     mainProgram = "cobang";
     platforms = lib.platforms.linux;
   };

From 190128840345ea8744a1d19c75e245affcbc62cf Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 25 Nov 2024 19:29:43 +0800
Subject: [PATCH 3/3] cobang: fix build

---
 pkgs/by-name/co/cobang/package.nix | 43 +++++++++++++-----------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix
index 16c06bfbf31c..1909421547ef 100644
--- a/pkgs/by-name/co/cobang/package.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -1,28 +1,17 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  brotlicffi,
-  gst-python,
-  kiss-headers,
-  logbook,
-  pillow,
-  pygobject3,
-  python-zbar,
-  requests,
-  single-version,
+  gst_all_1,
   gobject-introspection,
   gtk3,
   libhandy,
   librsvg,
   networkmanager,
-  setuptools,
-  python,
-  pytestCheckHook,
   wrapGAppsHook3,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cobang";
   version = "0.14.1";
   pyproject = true;
@@ -40,14 +29,14 @@ buildPythonApplication rec {
     sed -i '$ a\packages = ["cobang"]' pyproject.toml
   '';
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with python3Packages; [
     # Needed to recognize gobject namespaces
     gobject-introspection
     wrapGAppsHook3
     setuptools
   ];
 
-  buildInputs = [
+  buildInputs = with python3Packages; [
     # Requires v4l2src
     (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
     # For gobject namespaces
@@ -55,7 +44,7 @@ buildPythonApplication rec {
     networkmanager
   ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     brotlicffi
     kiss-headers
     logbook
@@ -69,21 +58,25 @@ buildPythonApplication rec {
     gst-python
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
   ];
 
+  pythonRelaxDeps = [
+    "Pillow"
+  ];
+
   # Wrapping this manually for SVG recognition
   dontWrapGApps = true;
 
   postInstall = ''
     # Needed by the application
-    cp -R data $out/${python.sitePackages}/
+    cp -R data $out/${python3Packages.python.sitePackages}/
 
     # Icons and applications
-    install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/
-    install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/
-    mv $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,}
+    install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/
+    install -Dm 644 $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/
+    mv $out/${python3Packages.python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,}
   '';
 
   preFixup = ''
@@ -93,11 +86,11 @@ buildPythonApplication rec {
       --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "QR code scanner desktop app for Linux";
     homepage = "https://github.com/hongquan/CoBang";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       aleksana
       dvaerum
     ];