diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-12-21 12:57:21 +0100 |
|---|---|---|
| committer | Daiderd Jordan <djordan@openmotics.com> | 2020-12-21 14:23:25 +0100 |
| commit | f8a04c7f6dde4b54f5362cb6ba6687c140230dc6 (patch) | |
| tree | 8af1cf79251a7bc6fe2a490d34de07c54cfad164 /pkgs | |
| parent | 6dd655466d423702bad41982cb3a7763f77c8e7d (diff) | |
installer: move channel setup out of activation
Fixes #234
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/darwin-installer/configuration.nix | 13 | ||||
| -rw-r--r-- | pkgs/darwin-installer/default.nix | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/darwin-installer/configuration.nix b/pkgs/darwin-installer/configuration.nix index a623a35..5db235c 100644 --- a/pkgs/darwin-installer/configuration.nix +++ b/pkgs/darwin-installer/configuration.nix @@ -11,20 +11,7 @@ with lib; system.activationScripts.preUserActivation.text = mkBefore '' PATH=/nix/var/nix/profiles/default/bin:$PATH - darwinPath=$(NIX_PATH=${concatStringsSep ":" config.nix.nixPath} nix-instantiate --eval -E '<darwin>' 2> /dev/null) || true i=y - if ! test -e "$darwinPath"; then - if test -t 1; then - read -p "Would you like to manage <darwin> with nix-channel? [y/n] " i - fi - case "$i" in - y|Y) - nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin - nix-channel --update - ;; - esac - fi - if ! test -L /etc/bashrc && ! tail -n1 /etc/bashrc | grep -q /etc/static/bashrc; then if test -t 1; then read -p "Would you like to load darwin configuration in /etc/bashrc? [y/n] " i diff --git a/pkgs/darwin-installer/default.nix b/pkgs/darwin-installer/default.nix index 807fb5c..a3fcc75 100644 --- a/pkgs/darwin-installer/default.nix +++ b/pkgs/darwin-installer/default.nix @@ -78,6 +78,20 @@ stdenv.mkDerivation { esac fi + i=y + darwinPath=$(NIX_PATH=$HOME/.nix-defexpr/channels nix-instantiate --eval -E '<darwin>' 2> /dev/null) || true + if ! test -e "$darwinPath"; then + if test -t 0; then + read -p "Would you like to manage <darwin> with nix-channel? [y/n] " i + fi + case "$i" in + y|Y) + nix-channel --add https://github.com/LnL7/nix-darwin/archive/master.tar.gz darwin + nix-channel --update + ;; + esac + fi + export NIX_PATH=${nixPath} system=$(nix-build '<darwin>' -I "user-darwin-config=$config" -A system --no-out-link --show-trace) |