mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-28 10:47:19 +00:00
Code Activity

checks: include channel paths for NIX_PATH checks

Browse source
This commit is contained in:
Daiderd Jordan 2018-10-26 17:26:14 +01:00
parent 06f8d83f60
commit e5c988edf1
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/system/checks.nix
View file

@ -81,7 +81,7 @@ let
'';
nixPath = ''
darwinConfig=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin-config>' || echo "$HOME/.nixpkgs/darwin-configuration.nix") || true
darwinConfig=$(NIX_PATH="${concatStringsSep ":" config.nix.nixPath}${optionalString config.nix.enableChannels ":$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels"}" nix-instantiate --eval -E '<darwin-config>' || echo "$HOME/.nixpkgs/darwin-configuration.nix") || true
if ! test -e "$darwinConfig"; then
echo "error: Changed <darwin-config> but target does not exist, aborting activation" >&2
echo "Create $darwinConfig or set environment.darwinConfig:" >&2
@ -95,7 +95,7 @@ let
exit 2
fi
darwinPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin>') || true
darwinPath=$(NIX_PATH="${concatStringsSep ":" config.nix.nixPath}${optionalString config.nix.enableChannels ":$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels"}" nix-instantiate --eval -E '<darwin>') || true
if ! test -e "$darwinPath"; then
echo "error: Changed <darwin> but target does not exist, aborting activation" >&2
echo "Add the darwin repo as a channel or set nix.nixPath:" >&2
@ -109,7 +109,7 @@ let
exit 2
fi
nixpkgsPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<nixpkgs>') || true
nixpkgsPath=$(NIX_PATH="${concatStringsSep ":" config.nix.nixPath}${optionalString config.nix.enableChannels ":$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels"}" nix-instantiate --eval -E '<nixpkgs>') || true
if ! test -e "$nixpkgsPath"; then
echo "error: Changed <nixpkgs> but target does not exist, aborting activation" >&2
echo "Add a nixpkgs channel or set nix.nixPath:" >&2