gnu: googletest: Don't use unstable tarball.
* gnu/packages/check.scm (googletest)[source]: Download using git-fetch. * gnu/packages/crypto.scm (encfs)[arguments]: Adjust accordingly. * gnu/packages/gnucash.scm (gnucash)[arguments]: Same. * gnu/packages/terminals.scm (eternalterminal)[arguments]: Same. * gnu/packages/graphics.scm (ogre)[arguments]: Same. Remove now unnecessary custom 'pre-build phase.
This commit is contained in:
parent
d98fb5603b
commit
d5640c587f
|
@ -485,13 +485,14 @@ test coverage and has a web user interface that will refresh automatically.")
|
||||||
(version "1.8.0")
|
(version "1.8.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append "https://github.com/google/googletest/archive/"
|
(uri (git-reference
|
||||||
"release-" version ".tar.gz"))
|
(url "https://github.com/google/googletest.git")
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(commit (string-append "release-" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq"))))
|
"0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
|
`(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
|
||||||
|
|
|
@ -208,9 +208,9 @@ OpenBSD tool of the same name.")
|
||||||
(add-after 'unpack 'unpack-googletest
|
(add-after 'unpack 'unpack-googletest
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(mkdir-p "vendor/github.com/google/googletest")
|
(mkdir-p "vendor/github.com/google/googletest")
|
||||||
(invoke "tar" "xvf" (assoc-ref inputs "googletest-source")
|
(copy-recursively (assoc-ref inputs "googletest-source")
|
||||||
"-C" "vendor/github.com/google/googletest"
|
"vendor/github.com/google/googletest")
|
||||||
"--strip-components=1")))
|
#t))
|
||||||
(add-before 'check 'make-unittests
|
(add-before 'check 'make-unittests
|
||||||
(lambda _
|
(lambda _
|
||||||
(invoke "make" "unittests"))))))
|
(invoke "make" "unittests"))))))
|
||||||
|
|
|
@ -105,8 +105,7 @@
|
||||||
(add-after 'unpack 'unpack-gmock
|
(add-after 'unpack 'unpack-gmock
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(mkdir "gmock")
|
(mkdir "gmock")
|
||||||
(invoke "tar" "xf" (assoc-ref inputs "googlemock")
|
(copy-recursively (assoc-ref inputs "googlemock") "gmock")
|
||||||
"-C" "gmock" "--strip-components=1")
|
|
||||||
(setenv "GMOCK_ROOT" (string-append (getcwd) "/gmock/googlemock"))
|
(setenv "GMOCK_ROOT" (string-append (getcwd) "/gmock/googlemock"))
|
||||||
#t))
|
#t))
|
||||||
(add-after 'unpack 'set-env-vars
|
(add-after 'unpack 'set-env-vars
|
||||||
|
|
|
@ -366,21 +366,10 @@ exception-handling library.")
|
||||||
'(#:phases
|
'(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-before 'configure 'pre-configure
|
(add-before 'configure 'pre-configure
|
||||||
(lambda _
|
|
||||||
;; It expects googletest source to be downloaded and
|
|
||||||
;; be in a specific place.
|
|
||||||
(substitute* "Tests/CMakeLists.txt"
|
|
||||||
(("URL(.*)$" _ suffix)
|
|
||||||
(string-append "URL " suffix
|
|
||||||
"\t\tURL_HASH "
|
|
||||||
"MD5=16877098823401d1bf2ed7891d7dce36\n")))
|
|
||||||
#t))
|
|
||||||
(add-before 'build 'pre-build
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(copy-file (assoc-ref inputs "googletest-source")
|
(substitute* "Tests/CMakeLists.txt"
|
||||||
(string-append (getcwd)
|
(("URL(.*)$")
|
||||||
"/Tests/googletest-prefix/src/"
|
(string-append "URL " (assoc-ref inputs "googletest-source"))))
|
||||||
"release-1.8.0.tar.gz"))
|
|
||||||
#t)))
|
#t)))
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list "-DOGRE_BUILD_TESTS=TRUE"
|
(list "-DOGRE_BUILD_TESTS=TRUE"
|
||||||
|
|
|
@ -1042,8 +1042,8 @@ comfortably in a pager or editor.
|
||||||
(add-after 'unpack 'insert-googletests
|
(add-after 'unpack 'insert-googletests
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(let ((tests (assoc-ref inputs "googletest")))
|
(let ((tests (assoc-ref inputs "googletest")))
|
||||||
(invoke "tar" "xvf" tests "-C" "external/googletest"
|
(copy-recursively tests "external/googletest"))
|
||||||
"--strip-components=1"))))
|
#t))
|
||||||
(add-after 'install 'dont-provide-gtest-libraries
|
(add-after 'install 'dont-provide-gtest-libraries
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((out (assoc-ref outputs "out")))
|
(let ((out (assoc-ref outputs "out")))
|
||||||
|
|
Loading…
Reference in New Issue