From ab5798054510314b016990c6594b4a4e2f92cc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 7 Feb 2025 18:35:12 +0100
Subject: [PATCH 1/2] python313Packages.pyzbar: switch to pyproject = true,
 misc cleanup

---
 pkgs/development/python-modules/pyzbar/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix
index 3a5c0b6ff36f..df3157915943 100644
--- a/pkgs/development/python-modules/pyzbar/default.nix
+++ b/pkgs/development/python-modules/pyzbar/default.nix
@@ -7,23 +7,26 @@
   pillow,
   zbar,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyzbar";
   version = "0.1.9";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NaturalHistoryMuseum";
     repo = "pyzbar";
-    rev = "v${version}";
+    tag = "v${version}";
     sha256 = "8IZQY6qB4r1SUPItDlTDnVQuPs0I38K3yJ6LiPJuwbU=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ zbar ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     pillow
     numpy
   ];
@@ -34,7 +37,7 @@ buildPythonPackage rec {
   # https://github.com/NixOS/nixpkgs/issues/7307
   postPatch = ''
     substituteInPlace pyzbar/zbar_library.py \
-      --replace \
+      --replace-fail \
         "find_library('zbar')" \
         '"${lib.getLib zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"'
   '';

From 8b14bd43791b37367d3a44d2b6e0d2fa8daaba3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 7 Feb 2025 18:35:25 +0100
Subject: [PATCH 2/2] python313Packages.pyzbar: use minimal zbar library

---
 pkgs/development/python-modules/pyzbar/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix
index df3157915943..8bfd6f404bc5 100644
--- a/pkgs/development/python-modules/pyzbar/default.nix
+++ b/pkgs/development/python-modules/pyzbar/default.nix
@@ -10,6 +10,12 @@
   setuptools,
 }:
 
+let
+  zbar' = zbar.override {
+    enableVideo = false;
+    withXorg = false;
+  };
+in
 buildPythonPackage rec {
   pname = "pyzbar";
   version = "0.1.9";
@@ -24,7 +30,7 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  buildInputs = [ zbar ];
+  buildInputs = [ zbar' ];
 
   dependencies = [
     pillow
@@ -39,7 +45,7 @@ buildPythonPackage rec {
     substituteInPlace pyzbar/zbar_library.py \
       --replace-fail \
         "find_library('zbar')" \
-        '"${lib.getLib zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"'
+        '"${lib.getLib zbar'}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"'
   '';
 
   disabledTests = [