gnu: zxing-cpp: Update to 1.2.0.
* gnu/packages/aidc.scm (zxing-cpp): Update to 1.2.0. Remove trailing #t. [native-inputs]: Remove field. [out-of-source?]: Remove argument. [tests?]: Set to #f. [configure-flags]: New argument. [phases]: Remove argument.
This commit is contained in:
parent
a9e83d7c7e
commit
95e99e3829
1 changed files with 8 additions and 25 deletions
|
@ -5,6 +5,7 @@
|
||||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||||
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
|
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
|
||||||
|
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -46,7 +47,7 @@
|
||||||
(define-public zxing-cpp
|
(define-public zxing-cpp
|
||||||
(package
|
(package
|
||||||
(name "zxing-cpp")
|
(name "zxing-cpp")
|
||||||
(version "1.0.8")
|
(version "1.2.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -56,32 +57,14 @@
|
||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "011sq8wcjfxbnd8sj6bf2fgkamlp8gj6q835g61c952npvwsnl71"))))
|
(base32 "1gjj9c7h634rrmmgzbc7cxjqsxdq0paj6113k02ncjm1s9abk7ik"))))
|
||||||
(native-inputs
|
|
||||||
`(("googletest-source" ,(package-source googletest))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:out-of-source? #f
|
;; The test suite build system is written in a way that required external
|
||||||
#:phases
|
;; libraries such as googletest, fmt and others are to be fetched from
|
||||||
(modify-phases %standard-phases
|
;; the network (see: https://github.com/nu-book/zxing-cpp/issues/260).
|
||||||
(add-after 'unpack 'unpack-googletest
|
`(#:tests? #f
|
||||||
;; Copy the googletest sources to where the CMake build expects them.
|
#:configure-flags '("-DBUILD_BLACKBOX_TESTS=OFF")))
|
||||||
(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")
|
(synopsis "C++ port of ZXing")
|
||||||
(description "ZXing-CPP is a barcode scanning library.")
|
(description "ZXing-CPP is a barcode scanning library.")
|
||||||
(home-page "https://github.com/nu-book/zxing-cpp")
|
(home-page "https://github.com/nu-book/zxing-cpp")
|
||||||
|
|
Reference in a new issue