gnu: Add r-flowsom.

[jackhill/guix/guix.git] / guix / config.scm.in

diff --git a/guix/config.scm.in b/guix/config.scm.in
index 4490112..0ada0f3 100644 (file)
--- 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, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Caleb Ristvedt <caleb.ristvedt@cune.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -33,9 +33,8 @@
             %config-directory
 
             %system
-            %libgcrypt
             %libz
-            %nix-instantiate
+            %liblz
             %gzip
             %bzip2
             %xz))
@@ -74,11 +73,11 @@
 
 (define %state-directory
   ;; This must match `NIX_STATE_DIR' as defined in `nix/local.mk'.
-  (or (getenv "NIX_STATE_DIR")
+  (or (getenv "GUIX_STATE_DIRECTORY")
       (string-append %localstatedir "/guix")))
 
 (define %store-database-directory
-  (or (getenv "NIX_DB_DIR")
+  (or (getenv "GUIX_DATABASE_DIRECTORY")
       (string-append %state-directory "/db")))
 
 (define %config-directory
@@ -89,14 +88,11 @@
 (define %system
   "@guix_system@")
 
-(define %libgcrypt
-  "@LIBGCRYPT@")
-
 (define %libz
   "@LIBZ@")
 
-(define %nix-instantiate
-  "@NIX_INSTANTIATE@")
+(define %liblz
+  "@LIBLZ@")
 
 (define %gzip
   "@GZIP@")