gnu: bless: Remove reference to %build-inputs.

* gnu/packages/bioinformatics.scm (bless)[arguments]: Replace reference to
%build-inputs with a gexp.  Use the dynamic library of zlib while we're at it.
[inputs]: Remove zlib:static.
This commit is contained in:
Ricardo Wurmus 2021-12-03 23:51:16 +01:00
parent dd19c8da88
commit f5c38ee45f
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -1917,17 +1917,17 @@ (define-public bless
(delete-file-recursively ".git"))))) (delete-file-recursively ".git")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ;no "check" target `(#:tests? #f ;no "check" target
#:make-flags #:make-flags
(list (string-append "ZLIB=" ,#~(list (string-append "ZLIB="
(assoc-ref %build-inputs "zlib:static") #$(this-package-input "zlib")
"/lib/libz.a") "/lib/libz.so")
(string-append "LDFLAGS=" (string-append "LDFLAGS="
(string-join '("-lboost_filesystem" (string-join '("-lboost_filesystem"
"-lboost_system" "-lboost_system"
"-lboost_iostreams" "-lboost_iostreams"
"-lz" "-lz"
"-fopenmp")))) "-fopenmp"))))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'do-not-build-bundled-pigz (add-after 'unpack 'do-not-build-bundled-pigz
@ -1959,7 +1959,6 @@ (define-public bless
("boost" ,boost) ("boost" ,boost)
("sparsehash" ,sparsehash) ("sparsehash" ,sparsehash)
("pigz" ,pigz) ("pigz" ,pigz)
("zlib:static" ,zlib "static")
("zlib" ,zlib))) ("zlib" ,zlib)))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
(home-page "https://sourceforge.net/p/bless-ec/wiki/Home/") (home-page "https://sourceforge.net/p/bless-ec/wiki/Home/")