summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-02-11 23:26:00 +0100
committerLudovic Courtès <ludo@gnu.org>2013-02-12 00:14:32 +0100
commit151794bf5b8300afac487a7dc9c45de736240730 (patch)
tree0f1c11ae00b6a5cd16a4dba8330a15595ae935ff
parentdf77a46273cf6d94f8d6264efdbfdba66ea6be13 (diff)
downloadpatches-151794bf5b8300afac487a7dc9c45de736240730.tar
patches-151794bf5b8300afac487a7dc9c45de736240730.tar.gz
build: Export `NIX_ROOT_FINDER' and `NIX_SETUID_HELPER' from `pre-inst-env'.
* pre-inst-env.in (NIX_ROOT_FINDER, NIX_SETUID_HELPER): New variables. Reported by Cyril Roelandt <tipecaml@gmail.com>.
-rw-r--r--pre-inst-env.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/pre-inst-env.in b/pre-inst-env.in
index aeadcfd820..1dc63cd90c 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -1,7 +1,7 @@
#!/bin/sh
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -32,6 +32,12 @@ export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
PATH="@abs_top_builddir@:$PATH"
export PATH
+# Daemon helpers.
+
+NIX_ROOT_FINDER="@abs_top_builddir@/nix/scripts/list-runtime-roots"
+NIX_SETUID_HELPER="@abs_top_builddir@/nix-setuid-helper"
+export NIX_ROOT_FINDER NIX_SETUID_HELPER
+
# The following variables need only be defined when compiling Guix
# modules, but we define them to be on the safe side in case of
# auto-compilation.