aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-08-25 16:33:09 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-08-25 16:33:09 +0200
commitf2984c7230f69a6e50810edc5e9d36bd671801f9 (patch)
tree11e80c8680973ed7b2dd8fb59b7d70729f350d5d
parent1bcccbab768587d80385a998bb3e450e2fdc2226 (diff)
downloadcuirass-f2984c7230f69a6e50810edc5e9d36bd671801f9.tar
cuirass-f2984c7230f69a6e50810edc5e9d36bd671801f9.tar.gz
Use Guile-zlib package.
* README (Requirements): Add Guile-zlib. * build-aux/guix.scm: Ditto. * src/cuirass/base.scm: Use Guile-zlib instead of (guix zlib).
-rw-r--r--README1
-rw-r--r--build-aux/guix.scm3
-rw-r--r--src/cuirass/base.scm2
3 files changed, 5 insertions, 1 deletions
diff --git a/README b/README
index c4cf8f0..18aa37c 100644
--- a/README
+++ b/README
@@ -12,6 +12,7 @@ Cuirass currently depends on the following packages:
- Guile-JSON 3.x
- Guile-SQLite3
- Guile-Git
+ - Guile-zlib
- Fibers
A convenient way to install those dependencies is to install Guix and execute
diff --git a/build-aux/guix.scm b/build-aux/guix.scm
index c963b05..2dbdd6e 100644
--- a/build-aux/guix.scm
+++ b/build-aux/guix.scm
@@ -68,9 +68,11 @@
(let* ((out (assoc-ref outputs "out"))
(json (assoc-ref inputs "guile-json"))
(sqlite (assoc-ref inputs "guile-sqlite3"))
+ (zlib (assoc-ref inputs "guile-zlib"))
(guix (assoc-ref inputs "guix"))
(mods (string-append json "/share/guile/site/3.0:"
sqlite "/share/guile/site/3.0:"
+ zlib "/share/guile/site/3.0:"
guix "/share/guile/site/3.0")))
(wrap-program (string-append out "/bin/cuirass")
`("GUILE_LOAD_PATH" ":" prefix (,mods))
@@ -82,6 +84,7 @@
"guile-json"
"guile-sqlite3"
"guile-git"
+ "guile-zlib"
"guix")))
(native-inputs
(map spec+package-list
diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 51bca6b..7a566d3 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -32,7 +32,7 @@
#:use-module (guix store)
#:use-module (guix git)
#:use-module (guix cache)
- #:use-module (guix zlib)
+ #:use-module (zlib)
#:use-module ((guix config) #:select (%state-directory))
#:use-module (git)
#:use-module (ice-9 binary-ports)