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 8f2c4ab..0ada0f3 100644 (file)
--- a/guix/config.scm.in
+++ b/guix/config.scm.in
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 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.
 ;;;
@@ -25,17 +26,15 @@
             %storedir
             %localstatedir
             %sysconfdir
-            %sbindir
 
             %store-directory
             %state-directory
+            %store-database-directory
             %config-directory
-            %guix-register-program
 
             %system
-            %libgcrypt
             %libz
-            %nix-instantiate
+            %liblz
             %gzip
             %bzip2
             %xz))
@@ -68,39 +67,32 @@
 (define %sysconfdir
   "@guix_sysconfdir@")
 
-(define %sbindir
-  "@guix_sbindir@")
-
 (define %store-directory
   (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path)
       %storedir))
 
 (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 "GUIX_DATABASE_DIRECTORY")
+      (string-append %state-directory "/db")))
+
 (define %config-directory
   ;; This must match `GUIX_CONFIGURATION_DIRECTORY' as defined in `nix/local.mk'.
   (or (getenv "GUIX_CONFIGURATION_DIRECTORY")
       (string-append %sysconfdir "/guix")))
 
-(define %guix-register-program
-  ;; The 'guix-register' program.
-  (or (getenv "GUIX_REGISTER")
-      (string-append %sbindir "/guix-register")))
-
 (define %system
   "@guix_system@")
 
-(define %libgcrypt
-  "@LIBGCRYPT@")
-
 (define %libz
   "@LIBZ@")
 
-(define %nix-instantiate
-  "@NIX_INSTANTIATE@")
+(define %liblz
+  "@LIBLZ@")
 
 (define %gzip
   "@GZIP@")