gnu: znc: Switch back to Guix's googletest package.
* gnu/packages/messaging.scm (znc)[native-inputs]: Use the packaged googletest's sources.
This commit is contained in:
parent
3b39f09fd9
commit
57945dd70c
2 changed files with 1 additions and 17 deletions
|
@ -478,8 +478,6 @@ test coverage and has a web user interface that will refresh automatically.")
|
||||||
(home-page "https://github.com/smartystreets/goconvey")
|
(home-page "https://github.com/smartystreets/goconvey")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
;; XXX When updating, check whether ZNC's GOOGLETEST-SOURCES can be
|
|
||||||
;; switched back to simply using (PACKAGE-SOURCE ...).
|
|
||||||
(define-public googletest
|
(define-public googletest
|
||||||
(package
|
(package
|
||||||
(name "googletest")
|
(name "googletest")
|
||||||
|
|
|
@ -517,21 +517,7 @@ compromised.")
|
||||||
"--with-gtest=googletest/googletest")
|
"--with-gtest=googletest/googletest")
|
||||||
#:test-target "test"))
|
#:test-target "test"))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("googletest-source"
|
`(("googletest-source" ,(package-source googletest))
|
||||||
;; ZNC 1.7 needs a newer, unreleased googletest (a release is planned
|
|
||||||
;; <https://github.com/google/googletest/issues/1583>, so don't update
|
|
||||||
;; the public GOOGLETEST to an unstable version). The commit is taken
|
|
||||||
;; from ‘third_party/googletest’ in the ZNC git repository.
|
|
||||||
,(let ((commit "9737e63c69e94ac5777caa0bc77c77d5206467f3"))
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/google/googletest")
|
|
||||||
(commit commit)))
|
|
||||||
(file-name (git-file-name "googletest-for-znc" commit))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0ya36n8d62zbxk6p22yffgx43mqhx2fz41gqqwbpdshjryf3wvxj")))))
|
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("python" ,python)))
|
("python" ,python)))
|
||||||
|
|
Reference in a new issue