~ruther/guix-local: gnu: bless: Remove reference to %build-inputs.

f5c38ee45f04913dbb930c8ae93eab45e53bfa90 — Ricardo Wurmus 4 years ago dd19c8d

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.

patch browse .tar.gz .zip

1 files changed, 10 insertions(+), 11 deletions(-)

M gnu/packages/bioinformatics.scm

M gnu/packages/bioinformatics.scm => gnu/packages/bioinformatics.scm +10 -11

@@ 1917,17 1917,17 @@ confidence to have in an alignment.")
                   (delete-file-recursively ".git")))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f ;no "check" target
+     `(#:tests? #f ;no "check" target
        #:make-flags
-       (list (string-append "ZLIB="
-                            (assoc-ref %build-inputs "zlib:static")
-                            "/lib/libz.a")
-             (string-append "LDFLAGS="
-                            (string-join '("-lboost_filesystem"
-                                           "-lboost_system"
-                                           "-lboost_iostreams"
-                                           "-lz"
-                                           "-fopenmp"))))
+       ,#~(list (string-append "ZLIB="
+                               #$(this-package-input "zlib")
+                               "/lib/libz.so")
+                (string-append "LDFLAGS="
+                               (string-join '("-lboost_filesystem"
+                                              "-lboost_system"
+                                              "-lboost_iostreams"
+                                              "-lz"
+                                              "-fopenmp"))))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'do-not-build-bundled-pigz


@@ 1959,7 1959,6 @@ confidence to have in an alignment.")
        ("boost" ,boost)
        ("sparsehash" ,sparsehash)
        ("pigz" ,pigz)
-       ("zlib:static" ,zlib "static")
        ("zlib" ,zlib)))
     (supported-systems '("x86_64-linux"))
     (home-page "https://sourceforge.net/p/bless-ec/wiki/Home/")