Merge branch 'master' into core-updates

1 files changed, 2 insertions, 16 deletions

diff --git a/guix/config.scm.in b/guix/config.scm.in
index dfe5fe0dbf..1a761b912e 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, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Caleb Ristvedt <caleb.ristvedt@cune.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -26,18 +26,15 @@
             %storedir
             %localstatedir
             %sysconfdir
-            %sbindir
 
             %store-directory
             %state-directory
             %store-database-directory
             %config-directory
-            %guix-register-program
 
             %system
             %libgcrypt
             %libz
-            %nix-instantiate
             %gzip
             %bzip2
             %xz))
@@ -70,9 +67,6 @@
 (define %sysconfdir
   "@guix_sysconfdir@")
 
-(define %sbindir
-  "@guix_sbindir@")
-
 (define %store-directory
   (or (and=> (getenv "NIX_STORE_DIR") canonicalize-path)
       %storedir))
@@ -83,7 +77,7 @@
       (string-append %localstatedir "/guix")))
 
 (define %store-database-directory
-  (or (and=> (getenv "NIX_DB_DIR") canonicalize-path)
+  (or (getenv "NIX_DB_DIR")
       (string-append %state-directory "/db")))
 
 (define %config-directory
@@ -91,11 +85,6 @@
   (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@")
 
@@ -105,9 +94,6 @@
 (define %libz
   "@LIBZ@")
 
-(define %nix-instantiate
-  "@NIX_INSTANTIATE@")
-
 (define %gzip
   "@GZIP@")