From 6c96858cad8d54e1f9dcab45daee5608641d6532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 May 2020 17:31:46 +0200
Subject: [PATCH] Allow passing extra nix.conf to installer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 573ff8dfcaacc4495e7f7880d86f70145a074578)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 scripts/install-multi-user.sh       | 1 +
 scripts/install-nix-from-closure.sh | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh
index 8269803c6..0356f321e 100644
--- a/scripts/install-multi-user.sh
+++ b/scripts/install-multi-user.sh
@@ -740,6 +740,7 @@ setup_default_profile() {
 
 place_nix_configuration() {
     cat <<EOF > "$SCRATCH/nix.conf"
+$NIX_EXTRA_CONF
 build-users-group = $NIX_BUILD_GROUP_NAME
 EOF
     _sudo "to place the default nix daemon configuration (part 2)" \
diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh
index 6ea23a44a..635aaa16d 100644
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -41,6 +41,7 @@ fi
 
 INSTALL_MODE=no-daemon
 CREATE_DARWIN_VOLUME=0
+NIX_EXTRA_CONF=
 # handle the command line flags
 while [ $# -gt 0 ]; do
     case $1 in
@@ -57,6 +58,9 @@ while [ $# -gt 0 ]; do
             NIX_INSTALLER_NO_MODIFY_PROFILE=1;;
         --darwin-use-unencrypted-nix-store-volume)
             CREATE_DARWIN_VOLUME=1;;
+        --nix-extra-conf-file)
+            NIX_EXTRA_CONF=$(cat $2)
+            shift;;
         *)
             (
                 echo "Nix Installer [--daemon|--no-daemon] [--no-channel-add] [--no-modify-profile]"