amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2017-09-21 20:34:49 +02:00
commit efa0ba499e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
10 changed files with 93 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/machine-learning.scm
View file

@ -520,14 +520,14 @@ and a QP solver.")
(define-public dlib
(package
(name "dlib")
(version "19.3")
(version "19.7")
(source (origin
(method url-fetch)
(uri (string-append
"http://dlib.net/files/dlib-" version ".tar.bz2"))
(sha256
(base32
"0gfy83av717qymv53yv7ki6mgh6mdw4xcxxbjk8lrs72f8qvnrcw"))
"1mljz02kwkrbggyncxv5fpnyjdybw2qihaacb3js8yfkw12vwpc2"))
(modules '((guix build utils)))
(snippet
'(begin
@ -537,7 +537,11 @@ and a QP solver.")
#t))))
(build-system cmake-build-system)
(arguments
`(#:phases
;; Recent releases defaults to "lib64" on 64bit.
`(#:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out")
"/lib"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-asserts
(lambda _
@ -572,7 +576,6 @@ and a QP solver.")
;; No test target, so we build and run the unit tests here.
(let ((test-dir (string-append "../dlib-" ,version "/dlib/test")))
(with-directory-excursion test-dir
(setenv "CXXFLAGS" "-std=gnu++11")
(and (zero? (system* "make" "-j" (number->string (parallel-job-count))))
(zero? (system* "./dtest" "--runall")))))))
(add-after 'install 'delete-static-library