From 22f102cbdc7e88ecb41b5d0a8720c8117e161aca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 23:22:21 +0200
Subject: [PATCH] nixos-install: Assume the build user group is "nixbld"
The build user group is always "nixbld", so no need to detect it.
---
nixos/modules/installer/tools/nixos-install.sh | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 7f3cfa2ca7d1..3fd8bdbd69e0 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -97,12 +97,7 @@ mkdir -m 0755 -p \
$mountPoint/nix/var/log/nix/drvs
mkdir -m 1775 -p $mountPoint/nix/store
-build_users_group=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"build-users-group"};')
-if test -n "$build_users_group"; then
- chown root:"$build_users_group" $mountPoint/nix/store
-else
- chown root $mountPoint/nix/store
-fi
+chown root:nixbld $mountPoint/nix/store
# Get the store paths to copy from the references graph.
@@ -130,9 +125,7 @@ unset NIX_REMOTE
# Create a temporary Nix config file that causes the nixbld users to
# be used.
-if test -n "$build_users_group"; then
- echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf
-fi
+echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf # FIXME: remove in Nix 1.8
binary_caches=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')
if test -n "$binary_caches"; then
echo "binary-caches = $binary_caches" >> $mountPoint/tmp/nix.conf