apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 91d0798164e462a4ad46d4468243a61585f74137 Author: Maxim Cournoyer <[email protected]> AuthorDate: Wed Oct 27 22:44:58 2021 -0400 gnu: zxing-cpp: Update to 1.2.0-0.00783db. * gnu/packages/aidc.scm (zxing-cpp): Update to 1.2.0-0.00783db. [version]: Use git-version. [source]: Adjust accordingly. [native-inputs]: Replace googletest-source by the regular googletest package. Add fmt. [arguments]: Remove field. --- gnu/packages/aidc.scm | 68 ++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 21fc195..2de4cb8 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -38,54 +38,38 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages qt) #:use-module (gnu packages video) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) (define-public zxing-cpp - (package - (name "zxing-cpp") - (version "1.0.8") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/nu-book/zxing-cpp";) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "011sq8wcjfxbnd8sj6bf2fgkamlp8gj6q835g61c952npvwsnl71")))) - (native-inputs - `(("googletest-source" ,(package-source googletest)))) - (build-system cmake-build-system) - (arguments - `(#:out-of-source? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-googletest - ;; Copy the googletest sources to where the CMake build expects them. - (lambda* (#:key inputs #:allow-other-keys) - (let ((source (assoc-ref inputs "googletest-source")) - (target "test/unit/googletest-src")) - (mkdir-p target) - (copy-recursively source target) - ;; Disable downloading via ExternalProject. - (substitute* "test/unit/CMakeLists.txt.in" - (("ExternalProject_Add\\(") "message(")) - #t))) - (replace 'check - (lambda _ - (with-directory-excursion "test/unit" - (invoke "cmake" ".") - (invoke "make") - (invoke "./ZXingUnitTest")) - #t))))) - (synopsis "C++ port of ZXing") - (description "ZXing-CPP is a barcode scanning library.") - (home-page "https://github.com/nu-book/zxing-cpp";) - (license license:asl2.0))) + ;; Use the master branch as it includes unreleased build system improvements + ;; allowing to use system libraries (instead of attempting to fetch them + ;; from the Internet). + (let ((revision "0") + (commit "00783db7aa3bcf8620a301854ac71c0ceaaca0c1")) + (package + (name "zxing-cpp") + (version (git-version "1.2.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nu-book/zxing-cpp";) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) + (build-system cmake-build-system) + (native-inputs + `(("fmt" ,fmt) + ("googletest" ,googletest))) + (synopsis "C++ port of ZXing") + (description "ZXing-CPP is a barcode scanning library.") + (home-page "https://github.com/nu-book/zxing-cpp";) + (license license:asl2.0)))) (define-public barcode (package
