From ce8c145a980f702add65d2b20a548b4ab67a7d24 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 11 Apr 2013 16:18:24 -0400 Subject: [PATCH] nixos-install: Include nix's perl libs in perl's INC Signed-off-by: Shea Levy --- modules/installer/tools/nixos-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh index fd8b9b28065d..2b7d73c43a5b 100644 --- a/modules/installer/tools/nixos-install.sh +++ b/modules/installer/tools/nixos-install.sh @@ -89,7 +89,7 @@ mkdir -m 0755 -p \ $mountPoint/nix/var/log/nix/drvs mkdir -m 1775 -p $mountPoint/nix/store -build_users_group=$(@perl@/bin/perl -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"build-users-group"};') +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 @@ -125,7 +125,7 @@ unset NIX_REMOTE if test -n "$build_users_group"; then echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf fi -binary_caches=$(@perl@/bin/perl -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};') +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 fi