mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-06 08:47:00 +00:00
Merge pull request #1283 from emilazy/push-nynpmzrmmozu
checks: remove `runLink`
This commit is contained in:
commit
65cc1fa8e3
1 changed files with 0 additions and 9 deletions
|
@ -47,14 +47,6 @@ let
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
runLink = ''
|
|
||||||
if [[ ! -e /run ]]; then
|
|
||||||
printf >&2 '[1;31merror: directory /run does not exist, aborting activation[0m\n'
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
|
|
||||||
oldBuildUsers = ''
|
oldBuildUsers = ''
|
||||||
if dscl . -list /Users | grep -q '^nixbld'; then
|
if dscl . -list /Users | grep -q '^nixbld'; then
|
||||||
echo "[1;31merror: Detected old style nixbld users, aborting activation[0m" >&2
|
echo "[1;31merror: Detected old style nixbld users, aborting activation[0m" >&2
|
||||||
|
@ -378,7 +370,6 @@ in
|
||||||
system.checks.text = mkMerge [
|
system.checks.text = mkMerge [
|
||||||
darwinChanges
|
darwinChanges
|
||||||
(mkIf cfg.verifyMacOSVersion macOSVersion)
|
(mkIf cfg.verifyMacOSVersion macOSVersion)
|
||||||
runLink
|
|
||||||
(mkIf (cfg.verifyBuildUsers && !config.nix.configureBuildUsers) oldBuildUsers)
|
(mkIf (cfg.verifyBuildUsers && !config.nix.configureBuildUsers) oldBuildUsers)
|
||||||
(mkIf cfg.verifyBuildUsers buildUsers)
|
(mkIf cfg.verifyBuildUsers buildUsers)
|
||||||
(mkIf cfg.verifyBuildUsers preSequoiaBuildUsers)
|
(mkIf cfg.verifyBuildUsers preSequoiaBuildUsers)
|
||||||
|
|
Loading…
Add table
Reference in a new issue