ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 06:06:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: Export '%config-directory'.

Browse source 
* configure.ac: Define and substitute 'guix_sysconfdir'.
* guix/config.scm.in (%config-directory): New variable.
This commit is contained in:
Ludovic Courtès 2013-12-29 15:52:50 +01:00
parent 04d4c8a439
commit 3f40cfdece
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -36,10 +36,12 @@ AC_ARG_ENABLE([daemon],
[guix_build_daemon="$enableval"], [guix_build_daemon="$enableval"],
[guix_build_daemon="yes"]) [guix_build_daemon="yes"])
# Prepare a version of $localstatedir that does not contain references # Prepare a version of $localstatedir & co. that does not contain references
# to shell variables. # to shell variables.
guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|/usr/local|g"`" guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|/usr/local|g"`"
guix_sysconfdir="`eval echo $sysconfdir | sed -e "s|NONE|/usr/local|g"`"
AC_SUBST([guix_localstatedir]) AC_SUBST([guix_localstatedir])
AC_SUBST([guix_sysconfdir])
dnl We require the pkg.m4 set of macros from pkg-config. dnl We require the pkg.m4 set of macros from pkg-config.
dnl Make sure it's available. dnl Make sure it's available.

5
guix/config.scm.in
View file

@ -23,6 +23,7 @@ (define-module (guix config)
%guix-home-page-url %guix-home-page-url
%store-directory %store-directory
%state-directory %state-directory
%config-directory
%system %system
%libgcrypt %libgcrypt
%nixpkgs %nixpkgs
@ -56,6 +57,10 @@ (define %state-directory
;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
"@guix_localstatedir@/nix") "@guix_localstatedir@/nix")
(define %config-directory
;; This must match `NIX_CONF_DIR' as defined in `daemon.am'.
(or (getenv "NIX_CONF_DIR") "@guix_sysconfdir@/guix"))
(define %system (define %system
"@guix_system@") "@guix_system@")