Merge pull request #265575 from natsukium/zxing-cpp

python311Packages.zxing-cpp: rename from zxing_cpp

7 files changed, 61 insertions, 35 deletions

diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix
index ca0bf4472a4c9..7f6bb6095dbe1 100644
--- a/pkgs/applications/misc/yubioath-flutter/helper.nix
+++ b/pkgs/applications/misc/yubioath-flutter/helper.nix
@@ -4,7 +4,7 @@
 , yubikey-manager
 , fido2
 , mss
-, zxing_cpp
+, zxing-cpp
 , pillow
 , cryptography
 
@@ -43,7 +43,7 @@ buildPythonApplication {
     yubikey-manager
     fido2
     mss
-    zxing_cpp
+    zxing-cpp
     pillow
     cryptography
   ];
diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix
index 7c5a3dc932760..d98958a8dfbab 100644
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@@ -215,7 +215,7 @@ python.pkgs.buildPythonApplication rec {
     whoosh
     zipp
     zope_interface
-    zxing_cpp
+    zxing-cpp
   ]
   ++ redis.optional-dependencies.hiredis
   ++ twisted.optional-dependencies.tls
diff --git a/pkgs/development/libraries/zxing-cpp/default.nix b/pkgs/development/libraries/zxing-cpp/default.nix
index 9cd78b7b56a18..1c010638693e7 100644
--- a/pkgs/development/libraries/zxing-cpp/default.nix
+++ b/pkgs/development/libraries/zxing-cpp/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      inherit (python3.pkgs) zxing_cpp;
+      inherit (python3.pkgs) zxing-cpp;
     };
     updateScript = gitUpdater {
       rev-prefix = "v";
diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix
new file mode 100644
index 0000000000000..dbdc4c50effd5
--- /dev/null
+++ b/pkgs/development/python-modules/zxing-cpp/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, cmake
+, setuptools-scm
+, numpy
+, pillow
+, pybind11
+, libzxing-cpp
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "zxing-cpp";
+  inherit (libzxing-cpp) src version meta;
+  pyproject = true;
+
+  sourceRoot = "${src.name}/wrappers/python";
+
+  # we don't need pybind11 in the root environment
+  # https://pybind11.readthedocs.io/en/stable/installing.html#include-with-pypi
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "pybind11[global]" "pybind11"
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  buildInputs = [
+    pybind11
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    setuptools-scm
+  ];
+
+  nativeCheckInputs = [
+    pillow
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "test.py"
+  ];
+
+  pythonImportsCheck = [
+    "zxingcpp"
+  ];
+}
diff --git a/pkgs/development/python-modules/zxing_cpp/default.nix b/pkgs/development/python-modules/zxing_cpp/default.nix
deleted file mode 100644
index b876ab05af3f2..0000000000000
--- a/pkgs/development/python-modules/zxing_cpp/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, cmake
-, numpy
-, pillow
-, pybind11
-, zxing-cpp
-}:
-
-buildPythonPackage rec {
-  pname = "zxing_cpp";
-  inherit (zxing-cpp) src version meta;
-
-  sourceRoot = "${src.name}/wrappers/python";
-
-  dontUseCmakeConfigure = true;
-
-  propagatedBuildInputs = [
-    pybind11
-    numpy
-  ];
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  nativeCheckInputs = [
-    pillow
-  ];
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 2d96df47c7d1b..8e146d396d903 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -450,4 +450,5 @@ mapAliases ({
   zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
   zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
   zope_proxy = zope-proxy; # added 2023-10-07
+  zxing_cpp = zxing-cpp; # added 2023-11-05
 })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0bd8881f3ed2..00708a0a65fde 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16113,5 +16113,7 @@ self: super: with self; {
 
   zxcvbn = callPackage ../development/python-modules/zxcvbn { };
 
-  zxing_cpp = callPackage ../development/python-modules/zxing_cpp { };
+  zxing-cpp = callPackage ../development/python-modules/zxing-cpp {
+    libzxing-cpp = pkgs.zxing-cpp;
+  };
 }