From 2f81259e5680f75c73b8177f5818c6fc544dddfc Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Tue, 23 Jun 2026 19:07:11 +0300 Subject: [PATCH] zxing-cpp: 2.3.0 -> 3.0.2 --- pkgs/by-name/zx/zxing-cpp/package.nix | 10 +++++++-- .../python-modules/zxing-cpp/default.nix | 22 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix index 1f9a2f42f289..182630f30259 100644 --- a/pkgs/by-name/zx/zxing-cpp/package.nix +++ b/pkgs/by-name/zx/zxing-cpp/package.nix @@ -6,25 +6,31 @@ python3, stdenv, libzint, + pkg-config, + stb, }: stdenv.mkDerivation (finalAttrs: { pname = "zxing-cpp"; - version = "2.3.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "zxing-cpp"; repo = "zxing-cpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-e3nSxjg8p+1DEUbZOh4C2zfnA6iGhNJMPiIe2oJEbRo="; + hash = "sha256-ZtjvHBnuPJkc9kU998jH7IPlX3jF/RGtLNWDzsb0v4A="; }; + strictDeps = true; + nativeBuildInputs = [ cmake + pkg-config ]; buildInputs = [ libzint + stb ]; cmakeFlags = [ diff --git a/pkgs/development/python-modules/zxing-cpp/default.nix b/pkgs/development/python-modules/zxing-cpp/default.nix index 35c96d1fa444..47e30e3667a2 100644 --- a/pkgs/development/python-modules/zxing-cpp/default.nix +++ b/pkgs/development/python-modules/zxing-cpp/default.nix @@ -6,16 +6,17 @@ pillow, pybind11, libzxing-cpp, + pyprojectVersionPatchHook, pytestCheckHook, libzint, }: -buildPythonPackage rec { +buildPythonPackage { pname = "zxing-cpp"; - inherit (libzxing-cpp) src version meta; + inherit (libzxing-cpp) src version; pyproject = true; - sourceRoot = "${src.name}/wrappers/python"; + sourceRoot = "${libzxing-cpp.src.name}/wrappers/python"; # we don't need pybind11 in the root environment # https://pybind11.readthedocs.io/en/stable/installing.html#include-with-pypi @@ -25,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace-fail "cfg = 'Debug' if self.debug else 'Release'" "cfg = 'Release'" \ - --replace-fail " '-DVERSION_INFO=' + self.distribution.get_version()]" " '-DVERSION_INFO=' + self.distribution.get_version(), '-DZXING_DEPENDENCIES=LOCAL', '-DZXING_USE_BUNDLED_ZINT=OFF']" + --replace-fail "f'-DPython_EXECUTABLE={sys.executable}'," "f'-DPython_EXECUTABLE={sys.executable}', '-DZXING_DEPENDENCIES=LOCAL', '-DZXING_USE_BUNDLED_ZINT=OFF'," ''; dontUseCmakeConfigure = true; @@ -39,6 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake + pyprojectVersionPatchHook ]; buildInputs = [ libzint ]; @@ -51,4 +53,16 @@ buildPythonPackage rec { enabledTestPaths = [ "test.py" ]; pythonImportsCheck = [ "zxingcpp" ]; + + meta = { + inherit (libzxing-cpp.meta) + homepage + changelog + description + longDescription + license + maintainers + platforms + ; + }; }