1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-13 20:30:02 +00:00

Merge pull request #42 from sellout/fix-bootstrap

Use the correct path for the darwin channel when bootstrapping.
This commit is contained in:
Daiderd Jordan 2017-09-17 20:41:35 +02:00 committed by GitHub
commit d371ec0208

View file

@ -142,9 +142,8 @@ install(){
nix-channel --update || exit
# Copy the example configuration
echo -e "Copying example configuration to "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC"..."
if [ ! -e "$HOME/.nixpkgs/darwin-configuration.nix" ]; then
echo -e "Copying example configuration to "$YELLOW"~/.nixpkgs/darwin-configuration.nix"$ESC"..."
mkdir -p "$HOME/.nixpkgs" || exit
cp "$HOME/.nix-defexpr/channels/darwin/modules/examples/simple.nix" "$HOME/.nixpkgs/darwin-configuration.nix" || exit
chmod u+w "$HOME/.nixpkgs/darwin-configuration.nix" || exit
@ -152,7 +151,7 @@ install(){
# Bootstrap build using default nix.nixPath
echo "Bootstrapping..."
export NIX_PATH=darwin=$HOME/.nix-defexpr/darwin:darwin-config=$HOME/.nixpkgs/darwin-configuration.nix:$NIX_PATH
export NIX_PATH=darwin=$HOME/.nix-defexpr/channels/darwin:darwin-config=$HOME/.nixpkgs/darwin-configuration.nix:$NIX_PATH
$(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild build || exit
$(nix-build '<darwin>' -A system --no-out-link)/sw/bin/darwin-rebuild switch || exit