diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-18 23:14:14 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-19 00:07:12 +0200 |
| commit | 721539026dda02e58addbb618f2102b31a2927f8 (patch) | |
| tree | adbf4ef7de758050ea1de575f3f0be2f5982295d /guix/config.scm.in | |
| parent | 2c2ec261a8d3c37e5147038f47ad24c57cde4134 (diff) | |
| download | gnu-guix-721539026dda02e58addbb618f2102b31a2927f8.tar gnu-guix-721539026dda02e58addbb618f2102b31a2927f8.tar.gz | |
Add (guix zlib).
* guix/zlib.scm, tests/zlib.scm: New files.
* Makefile.am (MODULES): Add guix/zlib.scm.
(SCM_TESTS): Add tests/zlib.scm.
* m4/guix.m4 (GUIX_LIBGCRYPT_LIBDIR): New macro.
* configure.ac (LIBGCRYPT_LIBDIR): Use it. Define and substitute
'LIBZ'.
* guix/config.scm.in (%libz): New variable.
Diffstat (limited to 'guix/config.scm.in')
| -rw-r--r-- | guix/config.scm.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index adffa0cfec..6d42cf233c 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +27,7 @@ %guix-register-program %system %libgcrypt + %libz %nix-instantiate %gzip %bzip2 @@ -72,6 +73,9 @@ (define %libgcrypt "@LIBGCRYPT@") +(define %libz + "@LIBZ@") + (define %nix-instantiate "@NIX_INSTANTIATE@") |